Publish

- 0x.js@1.0.1-rc.6
 - @0xproject/abi-gen@1.0.7
 - @0xproject/assert@1.0.7
 - @0xproject/base-contract@2.0.1
 - @0xproject/connect@2.0.0-rc.2
 - @0xproject/contract-wrappers@1.0.1-rc.5
 - contracts@2.1.42
 - @0xproject/dev-utils@1.0.6
 - @0xproject/fill-scenarios@1.0.1-rc.5
 - @0xproject/forwarder-helper@1.0.1-rc.2
 - @0xproject/json-schemas@1.0.1-rc.6
 - @0xproject/metacoin@0.0.17
 - @0xproject/migrations@1.0.6
 - @0xproject/monorepo-scripts@1.0.7
 - @0xproject/order-utils@1.0.1-rc.6
 - @0xproject/order-watcher@1.0.1-rc.5
 - @0xproject/react-docs@1.0.7
 - @0xproject/react-shared@1.0.8
 - @0xproject/sol-compiler@1.1.1
 - @0xproject/sol-cov@2.1.1
 - @0xproject/sol-resolver@1.0.7
 - @0xproject/sra-report@1.0.7
 - @0xproject/sra-spec@1.0.1-rc.6
 - @0xproject/subproviders@2.0.1
 - @0xproject/testnet-faucets@1.0.43
 - @0xproject/types@1.0.1-rc.6
 - @0xproject/utils@1.0.7
 - @0xproject/web3-wrapper@2.0.1
 - @0xproject/website@0.0.46

.circleci/config.yml

@@ -17,16 +17,19 @@ jobs:
             - yarn-packages-{{ .Branch }}
             - yarn-packages-master
             - yarn-packages-
+      - run:
+          name: install-yarn
+          command: sudo npm install --global yarn@1.9.4
       - run:
           name: yarn
-          command: yarn --frozen-lockfile install
+          command: yarn --frozen-lockfile install || yarn --frozen-lockfile install
       - save_cache:
           name: Save Yarn Package Cache
           key: yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
             - node_modules/
       - run: >
-            if [ -z "$(git diff --name-only v2-prototype packages/website)" ]; then
+            if [ -z "$(git diff --name-only development packages/website)" ]; then
                 yarn build --exclude website
             else
                 yarn build
@@ -66,6 +69,15 @@ jobs:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
       - run: yarn test:publish:circleci
+  test-doc-generation:
+    docker:
+      - image: circleci/node:9
+    working_directory: ~/repo
+    steps:
+      - restore_cache:
+          keys:
+            - repo-{{ .Environment.CIRCLE_SHA1 }}
+      - run: yarn test:generate_docs:circleci
   test-rest:
     docker:
       - image: circleci/node:9
@@ -74,7 +86,6 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - run: yarn wsrun test:circleci 0x.js
       - run: yarn wsrun test:circleci @0xproject/abi-gen
       - run: yarn wsrun test:circleci @0xproject/assert
       - run: yarn wsrun test:circleci @0xproject/base-contract
@@ -91,10 +102,6 @@ jobs:
       - run: yarn wsrun test:circleci @0xproject/subproviders
       - run: yarn wsrun test:circleci @0xproject/web3-wrapper
       - run: yarn wsrun test:circleci @0xproject/utils
-      - save_cache:
-          key: coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - ~/repo/packages/0x.js/coverage/lcov.info
       - save_cache:
           key: coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
           paths:
@@ -173,9 +180,6 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - restore_cache:
-          keys:
-            - coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
           keys:
             - coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
@@ -245,6 +249,9 @@ workflows:
       - test-publish:
           requires:
             - build
+      - test-doc-generation:
+          requires:
+            - build
       - submit-coverage:
           requires:
             - test-rest

.gitignore

@@ -84,6 +84,11 @@ packages/order-watcher/test/artifacts/
 packages/contract-wrappers/test/artifacts/
 packages/contract-wrappers/src/artifacts/
 packages/order-watcher/src/artifacts/
+packages/0x.js/src/artifacts/
+packages/order-utils/src/artifacts/
+
+# unstable generated contract artifacts:
+packages/migrations/artifacts/2.0.0/
 
 # generated contract watcher
 packages/0x.js/src/generated_contract_wrappers/

.prettierignore

@@ -15,7 +15,7 @@ lib
 /packages/contract-wrappers/src/artifacts
 /packages/order-watcher/src/artifacts
 /packages/metacoin/artifacts
-/packages/sra-api/public/
+/packages/sra-spec/public/
 /packages/contract-wrappers/test/artifacts
 /packages/order-watcher/test/artifacts
 /packages/migrations/artifacts/1.0.0

CODEOWNERS

@@ -0,0 +1,8 @@
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+# Website
+packages/website/  @BMillman19 @fragosti

README.md

@@ -8,7 +8,7 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 If you're developing on 0x now or are interested in using 0x infrastructure in the future, please join our [developer mailing list][dev-mailing-list-url] for updates.
 
-[website-url]: https://0xproject.com/
+[website-url]: https://0xproject.com
 [whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
 [dev-mailing-list-url]: http://eepurl.com/dx4cPf
 
@@ -33,6 +33,7 @@ If you're developing on 0x now or are interested in using 0x infrastructure in t
 | [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts)     | [![npm](https://img.shields.io/npm/v/@0xproject/monorepo-scripts.svg)](https://www.npmjs.com/package/@0xproject/monorepo-scripts)     | Monorepo scripts                                                                                                          |
 | [`@0xproject/react-docs`](/packages/react-docs)                 | [![npm](https://img.shields.io/npm/v/@0xproject/react-docs.svg)](https://www.npmjs.com/package/@0xproject/react-docs)                 | React documentation component for rendering TypeDoc & Doxity generated JSON                                               |
 | [`@0xproject/react-shared`](/packages/react-shared)             | [![npm](https://img.shields.io/npm/v/@0xproject/react-shared.svg)](https://www.npmjs.com/package/@0xproject/react-shared)             | 0x shared react components                                                                                                |
+| [`@0xproject/sra-spec`](/packages/sra-spec)                     | [![npm](https://img.shields.io/npm/v/@0xproject/sra-spec.svg)](https://www.npmjs.com/package/@0xproject/sra-spec)                     | OpenAPI specification for the standard relayer API                                                                        |
 | [`@0xproject/sra-report`](/packages/sra-report)                 | [![npm](https://img.shields.io/npm/v/@0xproject/sra-report.svg)](https://www.npmjs.com/package/@0xproject/sra-report)                 | Generate reports for standard relayer API compliance                                                                      |
 | [`@0xproject/sol-cov`](/packages/sol-cov)                       | [![npm](https://img.shields.io/npm/v/@0xproject/sol-cov.svg)](https://www.npmjs.com/package/@0xproject/sol-cov)                       | Solidity test coverage tool                                                                                               |
 | [`@0xproject/subproviders`](/packages/subproviders)             | [![npm](https://img.shields.io/npm/v/@0xproject/subproviders.svg)](https://www.npmjs.com/package/@0xproject/subproviders)             | Useful web3 subproviders (e.g LedgerSubprovider)                                                                          |
@@ -68,7 +69,7 @@ Dedicated documentation pages:
 Node version >= 6.12 is required.
 
 Most of the packages require additional typings for external dependencies.
-You can include those by prepending @0xproject/typescript-typings package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config.
+You can include those by prepending the `@0xproject/typescript-typings` package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config.
 
 ```json
 "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
@@ -82,13 +83,7 @@ We strongly recommend that the community help us make improvements and determine
 
 ### Install dependencies
 
-Make sure you are using Yarn v1.6. To install using brew:
+Make sure you are using Yarn v1.9.4. To install using brew:
-
-```
-brew unlink yarn
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/76215230de5f7f7bee2cfcdd7185cf49d949862d/Formula/yarn.rb
-brew switch yarn 1.6.0_1
-```
 
 Then install dependencies
 

package.json

@@ -15,7 +15,7 @@
         "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js",
         "test:installation:local": "IS_LOCAL_PUBLISH=true node ./packages/monorepo-scripts/lib/test_installation.js",
         "test:publish:circleci:comment": "HACK(albrow) We need an automated way to login to npm and echo+sleep piped to stdin was the only way I could find to do it.",
-        "test:publish:circleci": "{ echo \"test\"; sleep 1; echo \"test\"; sleep 1; echo \"test@example.com\"; } | npm login --registry=http://localhost:4873 && IS_LOCAL_PUBLISH=true run-s script:publish test:installation:local",
+        "test:publish:circleci": "yarn npm-cli-login -u test -p test -e test@example.com -r http://localhost:4873 && IS_LOCAL_PUBLISH=true run-s script:publish test:installation:local",
         "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish",
         "run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish",
         "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js",
@@ -32,19 +32,22 @@
         "rebuild": "run-s clean build",
         "rebuild:no_website": "run-s clean build:no_website",
         "test": "wsrun test $PKG --fast-exit --serial --exclude-missing",
-        "stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing",
+        "generate_doc": "node ./packages/monorepo-scripts/lib/doc_generate_and_upload.js",
+        "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i --shouldUpload false --isStaging true || break -1; done;",
         "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing",
         "comment:postinstall": "HACK: For some reason `yarn` is not setting up symlinks properly for order-utils. We temporarily set them manually. Remove this after V2 refactor is complete."
     },
     "config": {
-        "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
+        "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
+        "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-cov ethereum-types"
     },
     "devDependencies": {
-        "@0x-lerna-fork/lerna": "3.0.0-beta.23",
+        "@0x-lerna-fork/lerna": "3.0.0-beta.25",
         "async-child-process": "^1.1.1",
         "coveralls": "^3.0.0",
         "ganache-cli": "6.1.3",
         "lcov-result-merger": "^3.0.0",
+        "npm-cli-login": "^0.0.10",
         "npm-run-all": "^4.1.2",
         "prettier": "^1.11.1",
         "source-map-support": "^0.5.6",

packages/0x.js/CHANGELOG.json

@@ -1,4 +1,33 @@
 [
+    {
+        "version": "1.0.1-rc.6",
+        "changes": [
+            {
+                "note": "Fix missing `BlockParamLiteral` type import issue"
+            }
+        ],
+        "timestamp": 1535377027
+    },
+    {
+        "version": "1.0.1-rc.5",
+        "changes": [
+            {
+                "note":
+                    "Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js"
+            }
+        ]
+    },
+    {
+        "version": "1.0.1-rc.4",
+        "changes": [
+            {
+                "note":
+                    "Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher`",
+                "pr": 963
+            }
+        ],
+        "timestamp": 1535133899
+    },
     {
         "version": "1.0.1-rc.3",
         "changes": [

packages/0x.js/CHANGELOG.md

@@ -5,7 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.1-rc.3 - _August 13, 2018_
+## v1.0.1-rc.6 - _August 27, 2018_
+
+    * Fix missing `BlockParamLiteral` type import issue
+
+## v1.0.1-rc.5 - _Invalid date_
+
+    * Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js
+
+## v1.0.1-rc.4 - _August 24, 2018_
+
+    * Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher` (#963)
+
+## v1.0.1-rc.3 - _August 14, 2018_
 
     * Dependencies updated
     * Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914)
@@ -22,11 +34,11 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0-rc.2 - _July 19, 2018_
+## v1.0.0-rc.2 - _July 20, 2018_
 
     * Remove `zeroEx.assetData`  and instead re-export it's static functions directly off `ZeroEx`
 
-## v1.0.0-rc.1 - _July 19, 2018_
+## v1.0.0-rc.1 - _July 20, 2018_
 
     * Remove tokenRegistry wrapper (#863)
     * Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
@@ -66,7 +78,7 @@ CHANGELOG
     * Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
     * Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
 
-## v0.37.2 - _May 4, 2018_
+## v0.37.2 - _May 5, 2018_
 
     * Dependencies updated
 

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.1-rc.2",
+    "version": "1.0.1-rc.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -12,54 +12,28 @@
         "tokens",
         "exchange"
     ],
-    "main": "lib/src/index.js",
+    "main": "lib/index.js",
-    "types": "lib/src/index.d.ts",
+    "types": "lib/index.d.ts",
     "scripts": {
-        "watch_without_deps": "yarn pre_build && tsc -w",
+        "watch_without_deps": "tsc -w",
-        "build": "yarn pre_build && yarn build:all && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build": "yarn build:all",
-        "build:all": "run-p build:umd:prod build:commonjs; exit 0;",
+        "build:all": "run-p build:umd:prod build:commonjs",
-        "pre_build": "run-s update_artifacts generate_contract_wrappers",
-        "copy_artifacts": "copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts",
-        "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json src/artifacts; done;",
-        "generate_contract_wrappers": "abi-gen --abis 'src/artifacts/@(ZRXToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
         "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
         "test:circleci": "run-s test:coverage",
-        "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "clean": "shx rm -rf _bundles lib test_temp scripts src/generated_contract_wrappers",
+        "clean": "shx rm -rf _bundles lib test_temp src/generated_contract_wrappers generated_docs",
         "build:umd:prod": "NODE_ENV=production webpack",
-        "build:commonjs": "tsc && yarn copy_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build:commonjs": "tsc",
-        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
+        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES"
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
-        "docs:stage": "node scripts/stage_docs.js",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
-        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
     },
     "config": {
-        "contracts": "ZRXToken",
         "postpublish": {
             "assets": [
                 "packages/0x.js/_bundles/index.js",
                 "packages/0x.js/_bundles/index.min.js"
-            ],
+            ]
-            "docPublishConfigs": {
-                "extraFileIncludes": [
-                    "../types/src/index.ts",
-                    "../ethereum-types/src/index.ts",
-                    "../contract-wrappers/src/types.ts",
-                    "../contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/exchange_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts",
-                    "../order-watcher/src/order_watcher/order_watcher.ts"
-                ],
-                "s3BucketPath": "s3://doc-jsons/0x.js/",
-                "s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/"
-            }
         }
     },
     "repository": {
@@ -68,11 +42,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.4",
+        "@0xproject/abi-gen": "^1.0.7",
-        "@0xproject/dev-utils": "^1.0.3",
+        "@0xproject/dev-utils": "^1.0.6",
-        "@0xproject/migrations": "^1.0.3",
+        "@0xproject/migrations": "^1.0.6",
-        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/monorepo-scripts": "^1.0.7",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.6",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -81,7 +55,7 @@
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "json-loader": "^0.5.4",
         "make-promises-safe": "^1.1.0",
@@ -93,24 +67,26 @@
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
         "tslint": "5.11.0",
-        "typedoc": "0xProject/typedoc",
+        "typedoc": "0.12.0",
-        "typescript": "2.9.2",
+        "typescript": "3.0.1",
+        "uglifyjs-webpack-plugin": "^1.3.0",
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.4",
+        "@0xproject/assert": "^1.0.7",
-        "@0xproject/base-contract": "^1.0.4",
+        "@0xproject/base-contract": "^2.0.1",
-        "@0xproject/contract-wrappers": "^1.0.1-rc.2",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.5",
-        "@0xproject/order-utils": "^1.0.1-rc.2",
+        "@0xproject/order-utils": "^1.0.1-rc.6",
-        "@0xproject/sol-compiler": "^1.0.4",
+        "@0xproject/order-watcher": "^1.0.1-rc.5",
-        "@0xproject/subproviders": "^1.0.4",
+        "@0xproject/subproviders": "^2.0.1",
-        "@0xproject/types": "^1.0.1-rc.3",
+        "@0xproject/types": "^1.0.1-rc.6",
-        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/utils": "^1.0.7",
-        "@0xproject/web3-wrapper": "^1.1.2",
+        "@0xproject/web3-wrapper": "^2.0.1",
-        "ethereum-types": "^1.0.3",
+        "ethereum-types": "^1.0.5",
         "ethers": "3.0.22",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.5",
+        "web3-provider-engine": "14.0.6"
     },
     "publishConfig": {
         "access": "public"

packages/0x.js/src/0x.ts

@@ -1,279 +0,0 @@
-import { assert } from '@0xproject/assert';
-import {
-    ContractWrappers,
-    ContractWrappersConfig,
-    ERC20ProxyWrapper,
-    ERC20TokenWrapper,
-    ERC721ProxyWrapper,
-    ERC721TokenWrapper,
-    EtherTokenWrapper,
-    ExchangeWrapper,
-} from '@0xproject/contract-wrappers';
-import {
-    assetDataUtils,
-    ecSignOrderHashAsync,
-    generatePseudoRandomSalt,
-    isValidSignatureAsync,
-    orderHashUtils,
-} from '@0xproject/order-utils';
-// HACK: Since we export assetDataUtils from ZeroEx and it has AssetProxyId, ERC20AssetData and ERC721AssetData
-// in it's public interface, we need to import these types here.
-// tslint:disable-next-line:no-unused-variable
-import { AssetProxyId, ERC20AssetData, ERC721AssetData, Order, SignedOrder, SignerType } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
-
-import { constants } from './utils/constants';
-
-/**
- * The ZeroEx class is the single entry-point into the 0x.js library. It contains all of the library's functionality
- * and all calls to the library should be made through a ZeroEx instance.
- */
-export class ZeroEx {
-    /**
-     * When creating an order without a specified taker or feeRecipient you must supply the Solidity
-     * address null type (as opposed to Javascripts `null`, `undefined` or empty string). We expose
-     * this constant for your convenience.
-     */
-    public static NULL_ADDRESS = constants.NULL_ADDRESS;
-    /**
-     * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
-     */
-    public exchange: ExchangeWrapper;
-    /**
-     * An instance of the ERC20TokenWrapper class containing methods for interacting with any ERC20 token smart contract.
-     */
-    public erc20Token: ERC20TokenWrapper;
-    /**
-     * An instance of the ERC721TokenWrapper class containing methods for interacting with any ERC721 token smart contract.
-     */
-    public erc721Token: ERC721TokenWrapper;
-    /**
-     * An instance of the EtherTokenWrapper class containing methods for interacting with the
-     * wrapped ETH ERC20 token smart contract.
-     */
-    public etherToken: EtherTokenWrapper;
-    /**
-     * An instance of the ERC20ProxyWrapper class containing methods for interacting with the
-     * ERC20 proxy smart contract.
-     */
-    public erc20Proxy: ERC20ProxyWrapper;
-    /**
-     * An instance of the ERC721ProxyWrapper class containing methods for interacting with the
-     * ERC721 proxy smart contract.
-     */
-    public erc721Proxy: ERC721ProxyWrapper;
-    private readonly _contractWrappers: ContractWrappers;
-    /**
-     * Generates a pseudo-random 256-bit salt.
-     * The salt can be included in a 0x order, ensuring that the order generates a unique orderHash
-     * and will not collide with other outstanding orders that are identical in all other parameters.
-     * @return  A pseudo-random 256-bit number that can be used as a salt.
-     */
-    public static generatePseudoRandomSalt(): BigNumber {
-        return generatePseudoRandomSalt();
-    }
-    /**
-     * Computes the orderHash for a supplied order.
-     * @param   order   An object that conforms to the Order or SignedOrder interface definitions.
-     * @return  The resulting orderHash from hashing the supplied order.
-     */
-    public static getOrderHashHex(order: Order | SignedOrder): string {
-        return orderHashUtils.getOrderHashHex(order);
-    }
-    /**
-     * Checks if the supplied hex encoded order hash is valid.
-     * Note: Valid means it has the expected format, not that an order with the orderHash exists.
-     * Use this method when processing orderHashes submitted as user input.
-     * @param   orderHash    Hex encoded orderHash.
-     * @return  Whether the supplied orderHash has the expected format.
-     */
-    public static isValidOrderHash(orderHash: string): boolean {
-        return orderHashUtils.isValidOrderHash(orderHash);
-    }
-    /**
-     * A unit amount is defined as the amount of a token above the specified decimal places (integer part).
-     * E.g: If a currency has 18 decimal places, 1e18 or one quintillion of the currency is equivalent
-     * to 1 unit.
-     * @param   amount      The amount in baseUnits that you would like converted to units.
-     * @param   decimals    The number of decimal places the unit amount has.
-     * @return  The amount in units.
-     */
-    public static toUnitAmount(amount: BigNumber, decimals: number): BigNumber {
-        assert.isValidBaseUnitAmount('amount', amount);
-        assert.isNumber('decimals', decimals);
-        const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals);
-        return unitAmount;
-    }
-    /**
-     * A baseUnit is defined as the smallest denomination of a token. An amount expressed in baseUnits
-     * is the amount expressed in the smallest denomination.
-     * E.g: 1 unit of a token with 18 decimal places is expressed in baseUnits as 1000000000000000000
-     * @param   amount      The amount of units that you would like converted to baseUnits.
-     * @param   decimals    The number of decimal places the unit amount has.
-     * @return  The amount in baseUnits.
-     */
-    public static toBaseUnitAmount(amount: BigNumber, decimals: number): BigNumber {
-        assert.isBigNumber('amount', amount);
-        assert.isNumber('decimals', decimals);
-        const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amount, decimals);
-        return baseUnitAmount;
-    }
-    /**
-     * Encodes an ERC20 token address into a hex encoded assetData string, usable in the makerAssetData or
-     * takerAssetData fields in a 0x order.
-     * @param tokenAddress  The ERC20 token address to encode
-     * @return The hex encoded assetData string
-     */
-    public static encodeERC20AssetData(tokenAddress: string): string {
-        return assetDataUtils.encodeERC20AssetData(tokenAddress);
-    }
-    /**
-     * Decodes an ERC20 assetData hex string into it's corresponding ERC20 tokenAddress & assetProxyId
-     * @param assetData Hex encoded assetData string to decode
-     * @return An object containing the decoded tokenAddress & assetProxyId
-     */
-    public static decodeERC20AssetData(assetData: string): ERC20AssetData {
-        return assetDataUtils.decodeERC20AssetData(assetData);
-    }
-    /**
-     * Encodes an ERC721 token address into a hex encoded assetData string, usable in the makerAssetData or
-     * takerAssetData fields in a 0x order.
-     * @param tokenAddress  The ERC721 token address to encode
-     * @param tokenId  The ERC721 tokenId to encode
-     * @return The hex encoded assetData string
-     */
-    public static encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber): string {
-        return assetDataUtils.encodeERC721AssetData(tokenAddress, tokenId);
-    }
-    /**
-     * Decodes an ERC721 assetData hex string into it's corresponding ERC721 tokenAddress, tokenId & assetProxyId
-     * @param assetData Hex encoded assetData string to decode
-     * @return An object containing the decoded tokenAddress, tokenId & assetProxyId
-     */
-    public static decodeERC721AssetData(assetData: string): ERC721AssetData {
-        return assetDataUtils.decodeERC721AssetData(assetData);
-    }
-    /**
-     * Decode and return the assetProxyId from the assetData
-     * @param assetData Hex encoded assetData string to decode
-     * @return The assetProxyId
-     */
-    public static decodeAssetProxyId(assetData: string): AssetProxyId {
-        return assetDataUtils.decodeAssetProxyId(assetData);
-    }
-    /**
-     * Decode any assetData into it's corresponding assetData object
-     * @param assetData Hex encoded assetData string to decode
-     * @return Either a ERC20 or ERC721 assetData object
-     */
-    public static decodeAssetDataOrThrow(assetData: string): ERC20AssetData | ERC721AssetData {
-        return assetDataUtils.decodeAssetDataOrThrow(assetData);
-    }
-    /**
-     * Instantiates a new ZeroEx instance that provides the public interface to the 0x.js library.
-     * @param   provider    The Provider instance you would like the 0x.js library to use for interacting with
-     *                      the Ethereum network.
-     * @param   config      The configuration object. Look up the type for the description.
-     * @return  An instance of the 0x.js ZeroEx class.
-     */
-    constructor(provider: Provider, config: ContractWrappersConfig) {
-        assert.isWeb3Provider('provider', provider);
-        this._contractWrappers = new ContractWrappers(provider, config);
-
-        this.erc20Proxy = this._contractWrappers.erc20Proxy;
-        this.erc721Proxy = this._contractWrappers.erc721Proxy;
-        this.erc20Token = this._contractWrappers.erc20Token;
-        this.erc721Token = this._contractWrappers.erc721Token;
-        this.exchange = this._contractWrappers.exchange;
-        this.etherToken = this._contractWrappers.etherToken;
-    }
-    /**
-     * Verifies that the provided signature is valid according to the 0x Protocol smart contracts
-     * @param   data          The hex encoded data signed by the supplied signature.
-     * @param   signature     The hex encoded signature.
-     * @param   signerAddress The hex encoded address that signed the data, producing the supplied signature.
-     * @return  Whether the signature is valid for the supplied signerAddress and data.
-     */
-    public async isValidSignatureAsync(data: string, signature: string, signerAddress: string): Promise<boolean> {
-        const isValid = await isValidSignatureAsync(
-            this._contractWrappers.getProvider(),
-            data,
-            signature,
-            signerAddress,
-        );
-        return isValid;
-    }
-    /**
-     * Sets a new web3 provider for 0x.js. Updating the provider will stop all
-     * subscriptions so you will need to re-subscribe to all events relevant to your app after this call.
-     * @param   provider    The Web3Provider you would like the 0x.js library to use from now on.
-     * @param   networkId   The id of the network your provider is connected to
-     */
-    public setProvider(provider: Provider, networkId: number): void {
-        this._contractWrappers.setProvider(provider, networkId);
-    }
-    /**
-     * Get the provider instance currently used by 0x.js
-     * @return  Web3 provider instance
-     */
-    public getProvider(): Provider {
-        return this._contractWrappers.getProvider();
-    }
-    /**
-     * Get user Ethereum addresses available through the supplied web3 provider available for sending transactions.
-     * @return  An array of available user Ethereum addresses.
-     */
-    public async getAvailableAddressesAsync(): Promise<string[]> {
-        // Hack: Get Web3Wrapper from ContractWrappers
-        const web3Wrapper: Web3Wrapper = (this._contractWrappers as any)._web3Wrapper;
-        const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
-        return availableAddresses;
-    }
-    /**
-     * Signs an orderHash and returns it's elliptic curve signature.
-     * This method currently supports TestRPC, Geth and Parity above and below V1.6.6
-     * @param   orderHash       Hex encoded orderHash to sign.
-     * @param   signerAddress   The hex encoded Ethereum address you wish to sign it with. This address
-     *          must be available via the Provider supplied to 0x.js.
-     * @param   signerType the signer type that will perform the `eth_sign` operation. E.g Default, Metamask, Ledger or Trezor.
-     *          Some implementations exhibit different behaviour. Default will assume a spec compliant eth_sign implementation.
-     *          This parameter is defaulted to `SignerType.Default`.
-     * @return  A hex encoded string of the Elliptic curve signature parameters generated by signing the orderHash and signature type.
-     */
-    public async ecSignOrderHashAsync(
-        orderHash: string,
-        signerAddress: string,
-        signerType: SignerType = SignerType.Default,
-    ): Promise<string> {
-        const signature = await ecSignOrderHashAsync(
-            this._contractWrappers.getProvider(),
-            orderHash,
-            signerAddress,
-            signerType,
-        );
-        return signature;
-    }
-    /**
-     * Waits for a transaction to be mined and returns the transaction receipt.
-     * @param   txHash            Transaction hash
-     * @param   pollingIntervalMs How often (in ms) should we check if the transaction is mined.
-     * @param   timeoutMs         How long (in ms) to poll for transaction mined until aborting.
-     * @return  Transaction receipt with decoded log args.
-     */
-    public async awaitTransactionMinedAsync(
-        txHash: string,
-        pollingIntervalMs: number = 1000,
-        timeoutMs?: number,
-    ): Promise<TransactionReceiptWithDecodedLogs> {
-        // Hack: Get Web3Wrapper from ContractWrappers
-        const web3Wrapper: Web3Wrapper = (this._contractWrappers as any)._web3Wrapper;
-        const transactionReceiptWithDecodedLogs = await web3Wrapper.awaitTransactionMinedAsync(
-            txHash,
-            pollingIntervalMs,
-            timeoutMs,
-        );
-        return transactionReceiptWithDecodedLogs;
-    }
-}

packages/0x.js/src/artifacts.ts

@@ -1,7 +0,0 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
-
-import * as ZRXToken from './artifacts/ZRXToken.json';
-
-export const artifacts = {
-    ZRXToken: (ZRXToken as any) as ContractArtifact,
-};

packages/0x.js/src/index.ts

@@ -1,47 +1,22 @@
-export { ZeroEx } from './0x';
+export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils';
-
-export { Web3ProviderEngine, RPCSubprovider } from '@0xproject/subproviders';
 
 export {
-    ExchangeContractErrs,
+    ContractWrappers,
-    Order,
+    ERC20TokenWrapper,
-    SignedOrder,
+    ERC721TokenWrapper,
-    SignerType,
+    EtherTokenWrapper,
-    ECSignature,
+    ExchangeWrapper,
-    OrderStateValid,
+    ERC20ProxyWrapper,
-    OrderStateInvalid,
+    ERC721ProxyWrapper,
-    OrderState,
+    ForwarderWrapper,
-    Token,
-    ERC20AssetData,
-    ERC721AssetData,
-    AssetProxyId,
-} from '@0xproject/types';
-
-export {
-    BlockParamLiteral,
-    FilterObject,
-    BlockParam,
-    LogWithDecodedArgs,
-    ContractEventArg,
-    Provider,
-    TransactionReceipt,
-    TransactionReceiptWithDecodedLogs,
-} from 'ethereum-types';
-
-export {
-    EventCallback,
-    ContractEvent,
     IndexedFilterValues,
     BlockRange,
-    OrderFillRequest,
+    ContractWrappersConfig,
-    ContractEventArgs,
     MethodOpts,
     OrderTransactionOpts,
     TransactionOpts,
-    LogEvent,
+    OrderStatus,
-    DecodedLogEvent,
+    OrderInfo,
-    OnOrderStateChangeCallback,
-    ContractWrappersError,
     WETH9Events,
     WETH9WithdrawalEventArgs,
     WETH9ApprovalEventArgs,
@@ -56,11 +31,69 @@ export {
     ERC721TokenApprovalForAllEventArgs,
     ERC721TokenTransferEventArgs,
     ERC721TokenEvents,
+    ERC721TokenEventArgs,
     ExchangeCancelUpToEventArgs,
     ExchangeAssetProxyRegisteredEventArgs,
+    ExchangeSignatureValidatorApprovalEventArgs,
     ExchangeFillEventArgs,
     ExchangeCancelEventArgs,
+    ExchangeEvents,
+    EventCallback,
+    DecodedLogEvent,
     ExchangeEventArgs,
-    ContractWrappersConfig,
+    TransactionEncoder,
-    OrderInfo,
 } from '@0xproject/contract-wrappers';
+
+export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';
+
+export import Web3ProviderEngine = require('web3-provider-engine');
+
+export { RPCSubprovider, Callback, JSONRPCRequestPayloadWithMethod, ErrorCallback } from '@0xproject/subproviders';
+
+export { AbiDecoder } from '@0xproject/utils';
+
+export { BigNumber } from '@0xproject/utils';
+
+export {
+    ExchangeContractErrs,
+    Order,
+    SignedOrder,
+    ECSignature,
+    OrderStateValid,
+    OrderStateInvalid,
+    OrderState,
+    AssetProxyId,
+    SignerType,
+    ERC20AssetData,
+    ERC721AssetData,
+    SignatureType,
+    OrderRelevantState,
+} from '@0xproject/types';
+
+export {
+    BlockParamLiteral,
+    ContractAbi,
+    BlockParam,
+    LogWithDecodedArgs,
+    ContractEventArg,
+    Provider,
+    JSONRPCRequestPayload,
+    JSONRPCResponsePayload,
+    JSONRPCErrorCallback,
+    LogEntry,
+    DecodedLogArgs,
+    LogEntryEvent,
+    DecodedLogEntry,
+    DecodedLogEntryEvent,
+    RawLog,
+    AbiDefinition,
+    FunctionAbi,
+    EventAbi,
+    EventParameter,
+    MethodAbi,
+    ConstructorAbi,
+    FallbackAbi,
+    DataItem,
+    ConstructorStateMutability,
+    StateMutability,
+} from 'ethereum-types';

packages/0x.js/src/monorepo_scripts/postpublish.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

packages/0x.js/src/monorepo_scripts/stage_docs.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.publishDocsToStagingAsync(packageJSON, tsConfigJSON, cwd);

packages/0x.js/src/schemas/zero_ex_config_schema.ts

@@ -1,5 +0,0 @@
-export const zeroExConfigSchema = {
-    id: '/ZeroExConfig',
-    oneOf: [{ $ref: '/ZeroExPrivateNetworkConfig' }, { $ref: '/ZeroExPublicNetworkConfig' }],
-    type: 'object',
-};

packages/0x.js/src/schemas/zero_ex_private_network_config_schema.ts

@@ -1,35 +0,0 @@
-export const zeroExPrivateNetworkConfigSchema = {
-    id: '/ZeroExPrivateNetworkConfig',
-    properties: {
-        networkId: {
-            type: 'number',
-            minimum: 1,
-        },
-        gasPrice: { $ref: '/Number' },
-        zrxContractAddress: { $ref: '/Address' },
-        exchangeContractAddress: { $ref: '/Address' },
-        erc20ProxyContractAddress: { $ref: '/Address' },
-        erc721ProxyContractAddress: { $ref: '/Address' },
-        orderWatcherConfig: {
-            type: 'object',
-            properties: {
-                pollingIntervalMs: {
-                    type: 'number',
-                    minimum: 0,
-                },
-                numConfirmations: {
-                    type: 'number',
-                    minimum: 0,
-                },
-            },
-        },
-    },
-    type: 'object',
-    required: [
-        'networkId',
-        'zrxContractAddress',
-        'exchangeContractAddress',
-        'erc20ProxyContractAddress',
-        'erc721ProxyContractAddress',
-    ],
-};

packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts

@@ -1,43 +0,0 @@
-const networkNameToId: { [networkName: string]: number } = {
-    mainnet: 1,
-    ropsten: 3,
-    rinkeby: 4,
-    kovan: 42,
-    ganache: 50,
-};
-
-export const zeroExPublicNetworkConfigSchema = {
-    id: '/ZeroExPublicNetworkConfig',
-    properties: {
-        networkId: {
-            type: 'number',
-            enum: [
-                networkNameToId.mainnet,
-                networkNameToId.ropsten,
-                networkNameToId.rinkeby,
-                networkNameToId.kovan,
-                networkNameToId.ganache,
-            ],
-        },
-        gasPrice: { $ref: '/Number' },
-        zrxContractAddress: { $ref: '/Address' },
-        exchangeContractAddress: { $ref: '/Address' },
-        erc20ProxyContractAddress: { $ref: '/Address' },
-        erc721ProxyContractAddress: { $ref: '/Address' },
-        orderWatcherConfig: {
-            type: 'object',
-            properties: {
-                pollingIntervalMs: {
-                    type: 'number',
-                    minimum: 0,
-                },
-                numConfirmations: {
-                    type: 'number',
-                    minimum: 0,
-                },
-            },
-        },
-    },
-    type: 'object',
-    required: ['networkId'],
-};

packages/0x.js/src/types.ts

@@ -1,7 +0,0 @@
-export enum InternalZeroExError {
-    NoAbiDecoder = 'NO_ABI_DECODER',
-    ZrxNotInTokenRegistry = 'ZRX_NOT_IN_TOKEN_REGISTRY',
-    WethNotInTokenRegistry = 'WETH_NOT_IN_TOKEN_REGISTRY',
-}
-
-// tslint:disable:max-file-line-count

packages/0x.js/src/utils/constants.ts

@@ -1,4 +0,0 @@
-export const constants = {
-    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
-    TESTRPC_NETWORK_ID: 50,
-};

packages/0x.js/test/0x.js_test.ts

@@ -1,150 +0,0 @@
-import { ContractWrappers } from '@0xproject/contract-wrappers';
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { BigNumber } from '@0xproject/utils';
-import * as chai from 'chai';
-import 'mocha';
-
-import { ERC20TokenApprovalEventArgs, ERC20TokenEvents, LogWithDecodedArgs, ZeroEx } from '../src';
-
-import { chaiSetup } from './utils/chai_setup';
-import { constants } from './utils/constants';
-import { tokenUtils } from './utils/token_utils';
-import { provider, web3Wrapper } from './utils/web3_wrapper';
-
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-chaiSetup.configure();
-const expect = chai.expect;
-
-describe('ZeroEx library', () => {
-    let zeroEx: ZeroEx;
-    before(async () => {
-        const config = {
-            networkId: constants.TESTRPC_NETWORK_ID,
-        };
-        zeroEx = new ZeroEx(provider, config);
-    });
-    describe('#setProvider', () => {
-        it('overrides provider in nested web3s and invalidates contractInstances', async () => {
-            // Instantiate the contract instances with the current provider
-            await (zeroEx.exchange as any)._getExchangeContractAsync();
-            expect((zeroEx.exchange as any)._exchangeContractIfExists).to.not.be.undefined();
-
-            // Add property to newProvider so that we can differentiate it from old provider
-            (provider as any).zeroExTestId = 1;
-            zeroEx.setProvider(provider, constants.TESTRPC_NETWORK_ID);
-
-            // Check that contractInstances with old provider are removed after provider update
-            expect((zeroEx.exchange as any)._exchangeContractIfExists).to.be.undefined();
-
-            // Check that all nested zeroExContract/web3Wrapper instances return the updated provider
-            const nestedWeb3WrapperProvider = ((zeroEx as any)._contractWrappers as ContractWrappers).getProvider();
-            expect((nestedWeb3WrapperProvider as any).zeroExTestId).to.be.a('number');
-            const exchangeWeb3WrapperProvider = (zeroEx.exchange as any)._web3Wrapper.getProvider();
-            expect(exchangeWeb3WrapperProvider.zeroExTestId).to.be.a('number');
-        });
-    });
-    describe('#isValidSignature', () => {
-        const dataHex = '0x6927e990021d23b1eb7b8789f6a6feaf98fe104bb0cf8259421b79f9a34222b0';
-        const ethSignSignature =
-            '0x1B61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc3340349190569279751135161d22529dc25add4f6069af05be04cacbda2ace225403';
-        const address = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
-        const bytes32Zeros = '0x0000000000000000000000000000000000000000000000000000000000000000';
-        it("should return false if the data doesn't pertain to the signature & address", async () => {
-            return expect(
-                (zeroEx.exchange as any).isValidSignatureAsync(bytes32Zeros, address, ethSignSignature),
-            ).to.become(false);
-        });
-        it("should return false if the address doesn't pertain to the signature & data", async () => {
-            const validUnrelatedAddress = '0x8b0292b11a196601ed2ce54b665cafeca0347d42';
-            return expect(
-                (zeroEx.exchange as any).isValidSignatureAsync(dataHex, validUnrelatedAddress, ethSignSignature),
-            ).to.become(false);
-        });
-        it("should return false if the signature doesn't pertain to the dataHex & address", async () => {
-            const signatureArray = ethSignSignature.split('');
-            // tslint:disable-next-line:custom-no-magic-numbers
-            signatureArray[5] = 'C'; // V = 28, instead of 27
-            const wrongSignature = signatureArray.join('');
-            return expect((zeroEx.exchange as any).isValidSignatureAsync(dataHex, address, wrongSignature)).to.become(
-                false,
-            );
-        });
-        it('should return true if the signature does pertain to the dataHex & address', async () => {
-            return expect((zeroEx.exchange as any).isValidSignatureAsync(dataHex, address, ethSignSignature)).to.become(
-                true,
-            );
-        });
-    });
-    describe('#toUnitAmount', () => {
-        it('should throw if invalid baseUnit amount supplied as argument', () => {
-            const invalidBaseUnitAmount = new BigNumber(1000000000.4);
-            const decimals = 6;
-            expect(() => ZeroEx.toUnitAmount(invalidBaseUnitAmount, decimals)).to.throw(
-                'amount should be in baseUnits (no decimals), found value: 1000000000.4',
-            );
-        });
-        it('Should return the expected unit amount for the decimals passed in', () => {
-            const baseUnitAmount = new BigNumber(1000000000);
-            const decimals = 6;
-            const unitAmount = ZeroEx.toUnitAmount(baseUnitAmount, decimals);
-            const expectedUnitAmount = new BigNumber(1000);
-            expect(unitAmount).to.be.bignumber.equal(expectedUnitAmount);
-        });
-    });
-    describe('#toBaseUnitAmount', () => {
-        it('Should return the expected base unit amount for the decimals passed in', () => {
-            const unitAmount = new BigNumber(1000);
-            const decimals = 6;
-            const baseUnitAmount = ZeroEx.toBaseUnitAmount(unitAmount, decimals);
-            const expectedUnitAmount = new BigNumber(1000000000);
-            expect(baseUnitAmount).to.be.bignumber.equal(expectedUnitAmount);
-        });
-        it('should throw if unitAmount has more decimals then specified as the max decimal precision', () => {
-            const unitAmount = new BigNumber(0.823091);
-            const decimals = 5;
-            expect(() => ZeroEx.toBaseUnitAmount(unitAmount, decimals)).to.throw(
-                'Invalid unit amount: 0.823091 - Too many decimal places',
-            );
-        });
-    });
-    describe('#awaitTransactionMinedAsync', () => {
-        beforeEach(async () => {
-            await blockchainLifecycle.startAsync();
-        });
-        afterEach(async () => {
-            await blockchainLifecycle.revertAsync();
-        });
-        it('returns transaction receipt with decoded logs', async () => {
-            const availableAddresses = await zeroEx.getAvailableAddressesAsync();
-            const coinbase = availableAddresses[0];
-            const zrxTokenAddress = tokenUtils.getProtocolTokenAddress();
-            const erc20ProxyAddress = zeroEx.erc20Proxy.getContractAddress();
-            const txHash = await zeroEx.erc20Token.setUnlimitedProxyAllowanceAsync(zrxTokenAddress, coinbase);
-            const txReceiptWithDecodedLogs = await zeroEx.awaitTransactionMinedAsync(txHash);
-            // tslint:disable-next-line:no-unnecessary-type-assertion
-            const log = txReceiptWithDecodedLogs.logs[0] as LogWithDecodedArgs<ERC20TokenApprovalEventArgs>;
-            expect(log.event).to.be.equal(ERC20TokenEvents.Approval);
-            expect(log.args._owner).to.be.equal(coinbase);
-            expect(log.args._spender).to.be.equal(erc20ProxyAddress);
-            expect(log.args._value).to.be.bignumber.equal(zeroEx.erc20Token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS);
-        });
-    });
-    describe('#config', () => {
-        it('allows to specify exchange contract address', async () => {
-            const zeroExConfig = {
-                exchangeContractAddress: ZeroEx.NULL_ADDRESS,
-                networkId: constants.TESTRPC_NETWORK_ID,
-            };
-            const zeroExWithWrongExchangeAddress = new ZeroEx(provider, zeroExConfig);
-            expect(zeroExWithWrongExchangeAddress.exchange.getContractAddress()).to.be.equal(ZeroEx.NULL_ADDRESS);
-        });
-        it('allows to specify erc20Proxy contract address', async () => {
-            const zeroExConfig = {
-                erc20ProxyContractAddress: ZeroEx.NULL_ADDRESS,
-                networkId: constants.TESTRPC_NETWORK_ID,
-            };
-            const zeroExWithWrongERC20ProxyAddress = new ZeroEx(provider, zeroExConfig);
-            expect(zeroExWithWrongERC20ProxyAddress.erc20Proxy.getContractAddress()).to.be.equal(ZeroEx.NULL_ADDRESS);
-        });
-    });
-});

packages/0x.js/test/global_hooks.ts

@@ -1,17 +0,0 @@
-import { devConstants } from '@0xproject/dev-utils';
-import { runV2MigrationsAsync } from '@0xproject/migrations';
-
-import { provider } from './utils/web3_wrapper';
-
-before('migrate contracts', async function(): Promise<void> {
-    // HACK: Since the migrations take longer then our global mocha timeout limit
-    // we manually increase it for this before hook.
-    const mochaTestTimeoutMs = 20000;
-    this.timeout(mochaTestTimeoutMs); // tslint:disable-line:no-invalid-this
-    const txDefaults = {
-        gas: devConstants.GAS_LIMIT,
-        from: devConstants.TESTRPC_FIRST_ADDRESS,
-    };
-    const artifactsDir = `../migrations/artifacts/2.0.0`;
-    await runV2MigrationsAsync(provider, artifactsDir, txDefaults);
-});

packages/0x.js/test/utils/constants.ts

@@ -1,9 +0,0 @@
-export const constants = {
-    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
-    ROPSTEN_NETWORK_ID: 3,
-    KOVAN_NETWORK_ID: 42,
-    TESTRPC_NETWORK_ID: 50,
-    KOVAN_RPC_URL: 'https://kovan.infura.io/',
-    ROPSTEN_RPC_URL: 'https://ropsten.infura.io/',
-    ZRX_DECIMALS: 18,
-};

packages/0x.js/test/utils/token_utils.ts

@@ -1,9 +0,0 @@
-import { artifacts } from '../../src/artifacts';
-
-import { constants } from './constants';
-
-export const tokenUtils = {
-    getProtocolTokenAddress(): string {
-        return artifacts.ZRXToken.networks[constants.TESTRPC_NETWORK_ID].address;
-    },
-};

packages/0x.js/test/utils/web3_wrapper.ts

@@ -1,12 +0,0 @@
-import { devConstants, web3Factory } from '@0xproject/dev-utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { Provider } from 'ethereum-types';
-
-const txDefaults = {
-    from: devConstants.TESTRPC_FIRST_ADDRESS,
-    gas: devConstants.GAS_LIMIT,
-};
-const provider: Provider = web3Factory.getRpcProvider({ shouldUseInProcessGanache: true });
-const web3Wrapper = new Web3Wrapper(provider);
-
-export { provider, web3Wrapper, txDefaults };

packages/0x.js/webpack.config.js

@@ -3,6 +3,7 @@
  */
 const _ = require('lodash');
 const webpack = require('webpack');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const path = require('path');
 const production = process.env.NODE_ENV === 'production';
 
@@ -27,10 +28,16 @@ module.exports = {
     },
     devtool: 'source-map',
     plugins: [
-        new webpack.optimize.UglifyJsPlugin({
+        // TODO: Revert to webpack bundled version with webpack v4.
-            minimize: true,
+        // The v3 series bundled version does not support ES6 and
+        // fails to build.
+        new UglifyJsPlugin({
             sourceMap: true,
-            include: /\.min\.js$/,
+            uglifyOptions: {
+                mangle: {
+                    reserved: ['BigNumber'],
+                },
+            },
         }),
     ],
     module: {

packages/abi-gen/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1535377027,
+        "version": "1.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1535133899,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1534210131,
         "version": "1.0.5",

packages/abi-gen/CHANGELOG.md

@@ -5,7 +5,15 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.7 - _August 27, 2018_
+
+    * Dependencies updated
+
+## v1.0.6 - _August 24, 2018_
+
+    * Dependencies updated
+
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
@@ -25,7 +33,7 @@ CHANGELOG
 
     * Fix the abi-gen entry point in package.json (#901)
 
-## v1.0.0 - _July 19, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Convert e_r_c to erc in generated file names (#822)
     * Remove the output directory before writing to it (#822)
@@ -43,7 +51,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.3.1 - _May 31, 2018_
+## v0.3.1 - _June 1, 2018_
 
     * Incorrect publish that was unpublished
 
@@ -51,7 +59,7 @@ CHANGELOG
 
     * Properly export the executable binary (#588)
 
-## v0.2.13 - _May 4, 2018_
+## v0.2.13 - _May 5, 2018_
 
     * Dependencies updated
 

packages/abi-gen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "1.0.4",
+    "version": "1.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -10,14 +10,13 @@
     "scripts": {
         "watch_without_deps": "tsc -w",
         "lint": "tslint --project .",
-        "clean": "shx rm -rf lib scripts",
+        "clean": "shx rm -rf lib",
-        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
+        "build": "tsc",
         "test": "yarn run_mocha",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
         "test:circleci": "yarn test:coverage",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
-        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
+        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info"
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "bin": {
         "abi-gen": "bin/abi-gen.js"
@@ -32,10 +31,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/utils": "^1.0.7",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.3",
+        "ethereum-types": "^1.0.5",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.5",
@@ -46,8 +45,7 @@
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.6",
-        "@0xproject/tslint-config": "^1.0.4",
         "@types/glob": "5.0.35",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",
@@ -56,14 +54,14 @@
         "@types/tmp": "^0.0.33",
         "@types/yargs": "^10.0.0",
         "chai": "^4.1.2",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
         "mocha": "^5.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
-        "typescript": "2.9.2"
+        "typescript": "3.0.1"
     },
     "publishConfig": {
         "access": "public"

packages/abi-gen/src/monorepo_scripts/postpublish.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

packages/assert/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1535377027,
+        "version": "1.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1535133899,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1534210131,
         "version": "1.0.5",

packages/assert/CHANGELOG.md

@@ -5,7 +5,15 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.7 - _August 27, 2018_
+
+    * Dependencies updated
+
+## v1.0.6 - _August 24, 2018_
+
+    * Dependencies updated
+
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
@@ -25,7 +33,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 19, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values (#821)
 
@@ -41,7 +49,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.2.11 - _May 31, 2018_
+## v0.2.11 - _June 1, 2018_
 
     * Incorrect publish that was unpublished
 
@@ -49,7 +57,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.2.9 - _May 4, 2018_
+## v0.2.9 - _May 5, 2018_
 
     * Dependencies updated
 

packages/assert/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/assert",
-    "version": "1.0.4",
+    "version": "1.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -9,16 +9,15 @@
     "types": "lib/src/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
-        "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build": "tsc",
-        "clean": "shx rm -rf lib test_temp scripts",
+        "clean": "shx rm -rf lib test_temp",
         "lint": "tslint --project .",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s clean build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "test:circleci": "yarn test:coverage",
+        "test:circleci": "yarn test:coverage"
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "license": "Apache-2.0",
     "repository": {
@@ -30,13 +29,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.6",
-        "@0xproject/tslint-config": "^1.0.4",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/valid-url": "^1.0.2",
         "chai": "^4.0.1",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
@@ -44,12 +42,12 @@
         "nyc": "^11.0.1",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
-        "typescript": "2.9.2"
+        "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.1-rc.3",
+        "@0xproject/json-schemas": "^1.0.1-rc.6",
-        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/utils": "^1.0.7",
         "lodash": "^4.17.5",
         "valid-url": "^1.0.9"
     },

packages/assert/src/monorepo_scripts/postpublish.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

packages/base-contract/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1535377027,
+        "version": "2.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1535133899,
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.0.0-rc.1",
         "changes": [

packages/base-contract/CHANGELOG.md

@@ -5,7 +5,15 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v2.0.0-rc.1 - _August 13, 2018_
+## v2.0.1 - _August 27, 2018_
+
+    * Dependencies updated
+
+## v2.0.0 - _August 24, 2018_
+
+    * Dependencies updated
+
+## v2.0.0-rc.1 - _August 14, 2018_
 
     * Added strict encoding/decoding checks for sendTransaction and call (#915)
 
@@ -25,7 +33,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 19, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Dependencies updated
 
@@ -41,7 +49,7 @@ CHANGELOG
 
     * Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201
 
-## v0.3.3 - _May 31, 2018_
+## v0.3.3 - _June 1, 2018_
 
     * Incorrect publish that was unpublished
 
@@ -49,7 +57,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.3.1 - _May 4, 2018_
+## v0.3.1 - _May 5, 2018_
 
     * Dependencies updated
 

packages/base-contract/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "1.0.4",
+    "version": "2.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -9,16 +9,15 @@
     "types": "lib/src/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
-        "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build": "tsc",
-        "clean": "shx rm -rf lib scripts",
+        "clean": "shx rm -rf lib",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s clean build test",
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*",
+        "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*"
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "license": "Apache-2.0",
     "repository": {
@@ -30,23 +29,22 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.6",
-        "@0xproject/tslint-config": "^1.0.4",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
-        "typescript": "2.9.2"
+        "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/utils": "^1.0.7",
-        "@0xproject/web3-wrapper": "^1.1.2",
+        "@0xproject/web3-wrapper": "^2.0.1",
-        "ethereum-types": "^1.0.3",
+        "ethereum-types": "^1.0.5",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

packages/base-contract/src/monorepo_scripts/postpublish.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

packages/connect/CHANGELOG.json

@@ -1,4 +1,27 @@
 [
+    {
+        "version": "2.0.0-rc.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1535377027
+    },
+    {
+        "version": "2.0.0-rc.1",
+        "changes": [
+            {
+                "note": "Updated for SRA v2",
+                "pr": 974
+            },
+            {
+                "note": "Stopped exporting `Order` type",
+                "pr": 924
+            }
+        ],
+        "timestamp": 1535133899
+    },
     {
         "timestamp": 1534210131,
         "version": "1.0.5",

packages/connect/CHANGELOG.md

@@ -5,7 +5,16 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.5 - _August 13, 2018_
+## v2.0.0-rc.2 - _August 27, 2018_
+
+    * Dependencies updated
+
+## v2.0.0-rc.1 - _August 24, 2018_
+
+    * Updated for SRA v2 (#974)
+    * Stopped exporting `Order` type (#924)
+
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
@@ -25,7 +34,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 19, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`
 
@@ -49,7 +58,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.6.12 - _May 4, 2018_
+## v0.6.12 - _May 5, 2018_
 
     * Dependencies updated
 

packages/connect/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/connect",
-    "version": "1.0.4",
+    "version": "2.0.0-rc.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -16,8 +16,8 @@
     "types": "lib/src/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
-        "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build": "tsc",
-        "clean": "shx rm -rf lib test_temp scripts",
+        "clean": "shx rm -rf lib test_temp generated_docs",
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
         "lint": "tslint --project .",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
@@ -26,18 +26,11 @@
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "test:circleci": "yarn test:coverage",
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
+        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES"
-        "docs:stage": "node scripts/stage_docs.js",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
-        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
     },
     "config": {
         "postpublish": {
-            "assets": [],
+            "assets": []
-            "docPublishConfigs": {
-                "s3BucketPath": "s3://doc-jsons/connect/",
-                "s3StagingBucketPath": "s3://staging-doc-jsons/connect/"
-            }
         }
     },
     "repository": {
@@ -51,29 +44,30 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0xproject/assert": "^0.2.14",
+        "@0xproject/assert": "^1.0.7",
-        "@0xproject/json-schemas": "^0.8.3",
+        "@0xproject/json-schemas": "^1.0.1-rc.6",
-        "@0xproject/types": "^0.8.2",
+        "@0xproject/types": "^1.0.1-rc.6",
-        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/utils": "^1.0.7",
         "lodash": "^4.17.5",
         "query-string": "^5.0.1",
         "sinon": "^4.0.0",
+        "uuid": "^3.3.2",
         "websocket": "^1.0.25"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.6",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@types/fetch-mock": "^6.0.3",
-        "@types/fetch-mock": "^5.12.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/query-string": "^5.0.1",
         "@types/sinon": "^2.2.2",
+        "@types/uuid": "^3.4.3",
         "@types/websocket": "^0.0.39",
         "async-child-process": "^1.1.1",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "fetch-mock": "^5.13.1",
         "make-promises-safe": "^1.1.0",
@@ -82,8 +76,8 @@
         "nyc": "^11.0.1",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
-        "typedoc": "~0.8.0",
+        "typedoc": "0.12.0",
-        "typescript": "2.9.2"
+        "typescript": "3.0.1"
     },
     "publishConfig": {
         "access": "public"

packages/connect/src/http_client.ts

@@ -7,31 +7,25 @@ import * as queryString from 'query-string';
 
 import { schemas as clientSchemas } from './schemas/schemas';
 import {
+    APIOrder,
+    AssetPairsRequestOpts,
+    AssetPairsResponse,
     Client,
-    FeesRequest,
+    FeeRecipientsResponse,
-    FeesResponse,
     HttpRequestOptions,
     HttpRequestType,
     OrderbookRequest,
     OrderbookResponse,
+    OrderConfigRequest,
+    OrderConfigResponse,
     OrdersRequestOpts,
+    OrdersResponse,
     PagedRequestOpts,
-    TokenPairsItem,
+    RequestOpts,
-    TokenPairsRequestOpts,
 } from './types';
 import { relayerResponseJsonParsers } from './utils/relayer_response_json_parsers';
 
 const TRAILING_SLASHES_REGEX = /\/+$/;
-const DEFAULT_PAGED_REQUEST_OPTS: PagedRequestOpts = {
-    page: 1,
-    perPage: 100,
-};
-/**
- * This mapping defines how an option property name gets converted into an HTTP request query field
- */
-const OPTS_TO_QUERY_FIELD_MAP = {
-    perPage: 'per_page',
-};
 
 /**
  * This class includes all the functionality related to interacting with a set of HTTP endpoints
@@ -47,12 +41,8 @@ export class HttpClient implements Client {
         if (_.isUndefined(params) || _.isEmpty(params)) {
             return '';
         }
-        // format params into a form the api expects
-        const formattedParams = _.mapKeys(params, (_value: any, key: string) => {
-            return _.get(OPTS_TO_QUERY_FIELD_MAP, key, key);
-        });
         // stringify the formatted object
-        const stringifiedParams = queryString.stringify(formattedParams);
+        const stringifiedParams = queryString.stringify(params);
         return `?${stringifiedParams}`;
     }
     /**
@@ -65,34 +55,40 @@ export class HttpClient implements Client {
         this._apiEndpointUrl = url.replace(TRAILING_SLASHES_REGEX, ''); // remove trailing slashes
     }
     /**
-     * Retrieve token pair info from the API
+     * Retrieve assetData pair info from the API
-     * @param   requestOpts     Options specifying token information to retrieve and page information, defaults to { page: 1, perPage: 100 }
+     * @param   requestOpts     Options specifying assetData information to retrieve, page information, and network id.
-     * @return  The resulting TokenPairsItems that match the request
+     * @return  The resulting AssetPairsResponse that match the request
      */
-    public async getTokenPairsAsync(requestOpts?: TokenPairsRequestOpts & PagedRequestOpts): Promise<TokenPairsItem[]> {
+    public async getAssetPairsAsync(
+        requestOpts?: RequestOpts & AssetPairsRequestOpts & PagedRequestOpts,
+    ): Promise<AssetPairsResponse> {
         if (!_.isUndefined(requestOpts)) {
-            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.tokenPairsRequestOptsSchema);
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.assetPairsRequestOptsSchema);
             assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.pagedRequestOptsSchema);
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.requestOptsSchema);
         }
         const httpRequestOpts = {
-            params: _.defaults({}, requestOpts, DEFAULT_PAGED_REQUEST_OPTS),
+            params: requestOpts,
         };
-        const responseJson = await this._requestAsync('/token_pairs', HttpRequestType.Get, httpRequestOpts);
+        const responseJson = await this._requestAsync('/asset_pairs', HttpRequestType.Get, httpRequestOpts);
-        const tokenPairs = relayerResponseJsonParsers.parseTokenPairsJson(responseJson);
+        const assetDataPairs = relayerResponseJsonParsers.parseAssetDataPairsJson(responseJson);
-        return tokenPairs;
+        return assetDataPairs;
     }
     /**
      * Retrieve orders from the API
-     * @param   requestOpts     Options specifying orders to retrieve and page information, defaults to { page: 1, perPage: 100 }
+     * @param   requestOpts     Options specifying orders to retrieve and page information, page information, and network id.
-     * @return  The resulting SignedOrders that match the request
+     * @return  The resulting OrdersResponse that match the request
      */
-    public async getOrdersAsync(requestOpts?: OrdersRequestOpts & PagedRequestOpts): Promise<SignedOrder[]> {
+    public async getOrdersAsync(
+        requestOpts?: RequestOpts & OrdersRequestOpts & PagedRequestOpts,
+    ): Promise<OrdersResponse> {
         if (!_.isUndefined(requestOpts)) {
             assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.ordersRequestOptsSchema);
             assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.pagedRequestOptsSchema);
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.requestOptsSchema);
         }
         const httpRequestOpts = {
-            params: _.defaults({}, requestOpts, DEFAULT_PAGED_REQUEST_OPTS),
+            params: requestOpts,
         };
         const responseJson = await this._requestAsync(`/orders`, HttpRequestType.Get, httpRequestOpts);
         const orders = relayerResponseJsonParsers.parseOrdersJson(responseJson);
@@ -101,30 +97,37 @@ export class HttpClient implements Client {
     /**
      * Retrieve a specific order from the API
      * @param   orderHash     An orderHash generated from the desired order
-     * @return  The SignedOrder that matches the supplied orderHash
+     * @return  The APIOrder that matches the supplied orderHash
      */
-    public async getOrderAsync(orderHash: string): Promise<SignedOrder> {
+    public async getOrderAsync(orderHash: string, requestOpts?: RequestOpts): Promise<APIOrder> {
+        if (!_.isUndefined(requestOpts)) {
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.requestOptsSchema);
+        }
         assert.doesConformToSchema('orderHash', orderHash, schemas.orderHashSchema);
-        const responseJson = await this._requestAsync(`/order/${orderHash}`, HttpRequestType.Get);
+        const httpRequestOpts = {
-        const order = relayerResponseJsonParsers.parseOrderJson(responseJson);
+            params: requestOpts,
+        };
+        const responseJson = await this._requestAsync(`/order/${orderHash}`, HttpRequestType.Get, httpRequestOpts);
+        const order = relayerResponseJsonParsers.parseAPIOrderJson(responseJson);
         return order;
     }
     /**
      * Retrieve an orderbook from the API
      * @param   request         An OrderbookRequest instance describing the specific orderbook to retrieve
-     * @param   requestOpts     Options specifying page information, defaults to { page: 1, perPage: 100 }
+     * @param   requestOpts     Options specifying page information, and network id.
      * @return  The resulting OrderbookResponse that matches the request
      */
     public async getOrderbookAsync(
         request: OrderbookRequest,
-        requestOpts?: PagedRequestOpts,
+        requestOpts?: RequestOpts & PagedRequestOpts,
     ): Promise<OrderbookResponse> {
         assert.doesConformToSchema('request', request, clientSchemas.orderBookRequestSchema);
         if (!_.isUndefined(requestOpts)) {
             assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.pagedRequestOptsSchema);
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.requestOptsSchema);
         }
         const httpRequestOpts = {
-            params: _.defaults({}, request, requestOpts, DEFAULT_PAGED_REQUEST_OPTS),
+            params: _.defaults({}, request, requestOpts),
         };
         const responseJson = await this._requestAsync('/orderbook', HttpRequestType.Get, httpRequestOpts);
         const orderbook = relayerResponseJsonParsers.parseOrderbookResponseJson(responseJson);
@@ -132,28 +135,55 @@ export class HttpClient implements Client {
     }
     /**
      * Retrieve fee information from the API
-     * @param   request     A FeesRequest instance describing the specific fees to retrieve
+     * @param   request         A OrderConfigRequest instance describing the specific fees to retrieve
-     * @return  The resulting FeesResponse that matches the request
+     * @param   requestOpts     Options specifying network id.
+     * @return  The resulting OrderConfigResponse that matches the request
      */
-    public async getFeesAsync(request: FeesRequest): Promise<FeesResponse> {
+    public async getOrderConfigAsync(
-        assert.doesConformToSchema('request', request, clientSchemas.feesRequestSchema);
+        request: OrderConfigRequest,
+        requestOpts?: RequestOpts,
+    ): Promise<OrderConfigResponse> {
+        if (!_.isUndefined(requestOpts)) {
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.requestOptsSchema);
+        }
+        assert.doesConformToSchema('request', request, clientSchemas.orderConfigRequestSchema);
         const httpRequestOpts = {
+            params: requestOpts,
             payload: request,
         };
-        const responseJson = await this._requestAsync('/fees', HttpRequestType.Post, httpRequestOpts);
+        const responseJson = await this._requestAsync('/order_config', HttpRequestType.Post, httpRequestOpts);
-        const fees = relayerResponseJsonParsers.parseFeesResponseJson(responseJson);
+        const fees = relayerResponseJsonParsers.parseOrderConfigResponseJson(responseJson);
         return fees;
     }
+    /**
+     * Retrieve the list of fee recipient addresses used by the relayer.
+     * @param   requestOpts     Options specifying page information, and network id.
+     * @return  The resulting FeeRecipientsResponse
+     */
+    public async getFeeRecipientsAsync(requestOpts?: RequestOpts & PagedRequestOpts): Promise<FeeRecipientsResponse> {
+        if (!_.isUndefined(requestOpts)) {
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.pagedRequestOptsSchema);
+            assert.doesConformToSchema('requestOpts', requestOpts, clientSchemas.requestOptsSchema);
+        }
+        const httpRequestOpts = {
+            params: requestOpts,
+        };
+        const feeRecipients = await this._requestAsync('/fee_recipients', HttpRequestType.Get, httpRequestOpts);
+        assert.doesConformToSchema('feeRecipients', feeRecipients, schemas.relayerApiFeeRecipientsResponseSchema);
+        return feeRecipients;
+    }
     /**
      * Submit a signed order to the API
      * @param   signedOrder     A SignedOrder instance to submit
+     * @param   requestOpts     Options specifying network id.
      */
-    public async submitOrderAsync(signedOrder: SignedOrder): Promise<void> {
+    public async submitOrderAsync(signedOrder: SignedOrder, requestOpts?: RequestOpts): Promise<void> {
         assert.doesConformToSchema('signedOrder', signedOrder, schemas.signedOrderSchema);
-        const requestOpts = {
+        const httpRequestOpts = {
+            params: requestOpts,
             payload: signedOrder,
         };
-        await this._requestAsync('/order', HttpRequestType.Post, requestOpts);
+        await this._requestAsync('/order', HttpRequestType.Post, httpRequestOpts);
     }
     private async _requestAsync(
         path: string,

packages/connect/src/index.ts

@@ -1,19 +1,23 @@
 export { HttpClient } from './http_client';
-export { orderbookChannelFactory } from './orderbook_channel_factory';
+export { ordersChannelFactory } from './orders_channel_factory';
 export {
     Client,
-    FeesRequest,
+    OrderConfigRequest,
-    FeesResponse,
+    OrderConfigResponse,
-    OrderbookChannel,
+    OrdersChannel,
-    OrderbookChannelHandler,
+    OrdersChannelHandler,
-    OrderbookChannelSubscriptionOpts,
+    OrdersChannelSubscriptionOpts,
     OrderbookRequest,
     OrderbookResponse,
     OrdersRequestOpts,
     PagedRequestOpts,
-    TokenPairsItem,
+    AssetPairsRequestOpts,
-    TokenPairsRequestOpts,
+    RequestOpts,
-    TokenTradeInfo,
+    AssetPairsResponse,
+    FeeRecipientsResponse,
+    APIOrder,
+    OrdersResponse,
+    PaginatedCollection,
 } from './types';
 
-export { Order, SignedOrder } from '@0xproject/types';
+export { SignedOrder } from '@0xproject/types';

packages/connect/src/monorepo_scripts/postpublish.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

packages/connect/src/monorepo_scripts/stage_docs.ts

@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.publishDocsToStagingAsync(packageJSON, tsConfigJSON, cwd);

packages/connect/src/orderbook_channel_factory.ts

@@ -1,32 +0,0 @@
-import * as WebSocket from 'websocket';
-
-import { OrderbookChannel, OrderbookChannelHandler } from './types';
-import { assert } from './utils/assert';
-import { WebSocketOrderbookChannel } from './ws_orderbook_channel';
-
-export const orderbookChannelFactory = {
-    /**
-     * Instantiates a new WebSocketOrderbookChannel instance
-     * @param   url                  The relayer API base WS url you would like to interact with
-     * @param   handler              An OrderbookChannelHandler instance that responds to various
-     *                               channel updates
-     * @return  An OrderbookChannel Promise
-     */
-    async createWebSocketOrderbookChannelAsync(
-        url: string,
-        handler: OrderbookChannelHandler,
-    ): Promise<OrderbookChannel> {
-        assert.isUri('url', url);
-        assert.isOrderbookChannelHandler('handler', handler);
-        return new Promise<OrderbookChannel>((resolve, reject) => {
-            const client = new WebSocket.w3cwebsocket(url);
-            client.onopen = () => {
-                const orderbookChannel = new WebSocketOrderbookChannel(client, handler);
-                resolve(orderbookChannel);
-            };
-            client.onerror = err => {
-                reject(err);
-            };
-        });
-    },
-};

packages/connect/src/orders_channel_factory.ts

@@ -0,0 +1,29 @@
+import * as WebSocket from 'websocket';
+
+import { OrdersChannel, OrdersChannelHandler } from './types';
+import { assert } from './utils/assert';
+import { WebSocketOrdersChannel } from './ws_orders_channel';
+
+export const ordersChannelFactory = {
+    /**
+     * Instantiates a new WebSocketOrdersChannel instance
+     * @param   url                  The relayer API base WS url you would like to interact with
+     * @param   handler              An OrdersChannelHandler instance that responds to various
+     *                               channel updates
+     * @return  An OrdersChannel Promise
+     */
+    async createWebSocketOrdersChannelAsync(url: string, handler: OrdersChannelHandler): Promise<OrdersChannel> {
+        assert.isUri('url', url);
+        assert.isOrdersChannelHandler('handler', handler);
+        return new Promise<OrdersChannel>((resolve, reject) => {
+            const client = new WebSocket.w3cwebsocket(url);
+            client.onopen = () => {
+                const ordersChannel = new WebSocketOrdersChannel(client, handler);
+                resolve(ordersChannel);
+            };
+            client.onerror = err => {
+                reject(err);
+            };
+        });
+    },
+};

packages/connect/src/schemas/asset_pairs_request_opts_schema.ts

@@ -0,0 +1,8 @@
+export const assetPairsRequestOptsSchema = {
+    id: '/AssetPairsRequestOpts',
+    type: 'object',
+    properties: {
+        assetDataA: { $ref: '/hexSchema' },
+        assetDataB: { $ref: '/hexSchema' },
+    },
+};

packages/connect/src/schemas/fees_request_schema.ts

@@ -1,26 +0,0 @@
-export const feesRequestSchema = {
-    id: '/FeesRequest',
-    type: 'object',
-    properties: {
-        exchangeContractAddress: { $ref: '/Address' },
-        maker: { $ref: '/Address' },
-        taker: { $ref: '/Address' },
-        makerTokenAddress: { $ref: '/Address' },
-        takerTokenAddress: { $ref: '/Address' },
-        makerTokenAmount: { $ref: '/Number' },
-        takerTokenAmount: { $ref: '/Number' },
-        expirationUnixTimestampSec: { $ref: '/Number' },
-        salt: { $ref: '/Number' },
-    },
-    required: [
-        'exchangeContractAddress',
-        'maker',
-        'taker',
-        'makerTokenAddress',
-        'takerTokenAddress',
-        'makerTokenAmount',
-        'takerTokenAmount',
-        'expirationUnixTimestampSec',
-        'salt',
-    ],
-};

packages/connect/src/schemas/order_config_request_schema.ts

@@ -0,0 +1,24 @@
+export const orderConfigRequestSchema = {
+    id: '/OrderConfigRequest',
+    type: 'object',
+    properties: {
+        makerAddress: { $ref: '/addressSchema' },
+        takerAddress: { $ref: '/addressSchema' },
+        makerAssetAmount: { $ref: '/numberSchema' },
+        takerAssetAmount: { $ref: '/numberSchema' },
+        makerAssetData: { $ref: '/hexSchema' },
+        takerAssetData: { $ref: '/hexSchema' },
+        exchangeAddress: { $ref: '/addressSchema' },
+        expirationTimeSeconds: { $ref: '/numberSchema' },
+    },
+    required: [
+        'makerAddress',
+        'takerAddress',
+        'makerAssetAmount',
+        'takerAssetAmount',
+        'makerAssetData',
+        'takerAssetData',
+        'exchangeAddress',
+        'expirationTimeSeconds',
+    ],
+};

packages/connect/src/schemas/orderbook_request_schema.ts

@@ -2,8 +2,8 @@ export const orderBookRequestSchema = {
     id: '/OrderBookRequest',
     type: 'object',
     properties: {
-        baseTokenAddress: { $ref: '/Address' },
+        baseAssetData: { $ref: '/hexSchema' },
-        quoteTokenAddress: { $ref: '/Address' },
+        quoteAssetData: { $ref: '/hexSchema' },
     },
-    required: ['baseTokenAddress', 'quoteTokenAddress'],
+    required: ['baseAssetData', 'quoteAssetData'],
 };

packages/connect/src/schemas/orders_request_opts_schema.ts

@@ -2,15 +2,18 @@ export const ordersRequestOptsSchema = {
     id: '/OrdersRequestOpts',
     type: 'object',
     properties: {
-        exchangeContractAddress: { $ref: '/Address' },
+        makerAssetProxyId: { $ref: '/hexSchema' },
-        tokenAddress: { $ref: '/Address' },
+        takerAssetProxyId: { $ref: '/hexSchema' },
-        makerTokenAddress: { $ref: '/Address' },
+        makerAssetAddress: { $ref: '/addressSchema' },
-        takerTokenAddress: { $ref: '/Address' },
+        takerAssetAddress: { $ref: '/addressSchema' },
-        tokenA: { $ref: '/Address' },
+        exchangeAddress: { $ref: '/addressSchema' },
-        tokenB: { $ref: '/Address' },
+        senderAddress: { $ref: '/addressSchema' },
-        maker: { $ref: '/Address' },
+        makerAssetData: { $ref: '/hexSchema' },
-        taker: { $ref: '/Address' },
+        takerAssetData: { $ref: '/hexSchema' },
-        trader: { $ref: '/Address' },
+        traderAssetData: { $ref: '/hexSchema' },
-        feeRecipient: { $ref: '/Address' },
+        makerAddress: { $ref: '/addressSchema' },
+        takerAddress: { $ref: '/addressSchema' },
+        traderAddress: { $ref: '/addressSchema' },
+        feeRecipientAddress: { $ref: '/addressSchema' },
     },
 };

packages/connect/src/schemas/request_opts_schema.ts

@@ -0,0 +1,7 @@
+export const requestOptsSchema = {
+    id: '/RequestOpts',
+    type: 'object',
+    properties: {
+        networkId: { type: 'number' },
+    },
+};

packages/connect/src/schemas/schemas.ts

@@ -1,13 +1,15 @@
-import { feesRequestSchema } from './fees_request_schema';
+import { assetPairsRequestOptsSchema } from './asset_pairs_request_opts_schema';
+import { orderConfigRequestSchema } from './order_config_request_schema';
 import { orderBookRequestSchema } from './orderbook_request_schema';
 import { ordersRequestOptsSchema } from './orders_request_opts_schema';
 import { pagedRequestOptsSchema } from './paged_request_opts_schema';
-import { tokenPairsRequestOptsSchema } from './token_pairs_request_opts_schema';
+import { requestOptsSchema } from './request_opts_schema';
 
 export const schemas = {
-    feesRequestSchema,
+    orderConfigRequestSchema,
     orderBookRequestSchema,
     ordersRequestOptsSchema,
     pagedRequestOptsSchema,
-    tokenPairsRequestOptsSchema,
+    requestOptsSchema,
+    assetPairsRequestOptsSchema,
 };

packages/connect/src/schemas/token_pairs_request_opts_schema.ts

@@ -1,8 +0,0 @@
-export const tokenPairsRequestOptsSchema = {
-    id: '/TokenPairsRequestOpts',
-    type: 'object',
-    properties: {
-        tokenA: { $ref: '/Address' },
-        tokenB: { $ref: '/Address' },
-    },
-};

packages/connect/src/types.ts

@@ -2,73 +2,55 @@ import { SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 
 export interface Client {
-    getTokenPairsAsync: (requestOpts?: TokenPairsRequestOpts & PagedRequestOpts) => Promise<TokenPairsItem[]>;
+    getAssetPairsAsync: (
-    getOrdersAsync: (requestOpts?: OrdersRequestOpts & PagedRequestOpts) => Promise<SignedOrder[]>;
+        requestOpts?: AssetPairsRequestOpts & PagedRequestOpts,
-    getOrderAsync: (orderHash: string) => Promise<SignedOrder>;
+    ) => Promise<PaginatedCollection<AssetPairsItem>>;
+    getOrdersAsync: (requestOpts?: OrdersRequestOpts & PagedRequestOpts) => Promise<PaginatedCollection<APIOrder>>;
+    getOrderAsync: (orderHash: string) => Promise<APIOrder>;
     getOrderbookAsync: (request: OrderbookRequest, requestOpts?: PagedRequestOpts) => Promise<OrderbookResponse>;
-    getFeesAsync: (request: FeesRequest) => Promise<FeesResponse>;
+    getOrderConfigAsync: (request: OrderConfigRequest) => Promise<OrderConfigResponse>;
+    getFeeRecipientsAsync: (requestOpts?: PagedRequestOpts) => Promise<FeeRecipientsResponse>;
     submitOrderAsync: (signedOrder: SignedOrder) => Promise<void>;
 }
 
-export interface OrderbookChannel {
+export interface OrdersChannel {
-    subscribe: (subscriptionOpts: OrderbookChannelSubscriptionOpts) => void;
+    subscribe: (subscriptionOpts: OrdersChannelSubscriptionOpts) => void;
     close: () => void;
 }
 
 /**
- * baseTokenAddress: The address of token designated as the baseToken in the currency pair calculation of price
+ * baseAssetData: The address of assetData designated as the baseToken in the currency pair calculation of price
- * quoteTokenAddress: The address of token designated as the quoteToken in the currency pair calculation of price
+ * quoteAssetData: The address of assetData designated as the quoteToken in the currency pair calculation of price
- * snapshot: If true, a snapshot of the orderbook will be sent before the updates to the orderbook
  * limit: Maximum number of bids and asks in orderbook snapshot
  */
-export interface OrderbookChannelSubscriptionOpts {
+export interface OrdersChannelSubscriptionOpts {
-    baseTokenAddress: string;
+    baseAssetData: string;
-    quoteTokenAddress: string;
+    quoteAssetData: string;
-    snapshot: boolean;
     limit: number;
 }
 
-export interface OrderbookChannelHandler {
+export interface OrdersChannelHandler {
-    onSnapshot: (
+    onUpdate: (channel: OrdersChannel, subscriptionOpts: OrdersChannelSubscriptionOpts, orders: APIOrder[]) => void;
-        channel: OrderbookChannel,
+    onError: (channel: OrdersChannel, err: Error, subscriptionOpts?: OrdersChannelSubscriptionOpts) => void;
-        subscriptionOpts: OrderbookChannelSubscriptionOpts,
+    onClose: (channel: OrdersChannel) => void;
-        snapshot: OrderbookResponse,
-    ) => void;
-    onUpdate: (
-        channel: OrderbookChannel,
-        subscriptionOpts: OrderbookChannelSubscriptionOpts,
-        order: SignedOrder,
-    ) => void;
-    onError: (channel: OrderbookChannel, err: Error, subscriptionOpts?: OrderbookChannelSubscriptionOpts) => void;
-    onClose: (channel: OrderbookChannel) => void;
 }
 
-export type OrderbookChannelMessage =
+export type OrdersChannelMessage = UpdateOrdersChannelMessage | UnknownOrdersChannelMessage;
-    | SnapshotOrderbookChannelMessage
-    | UpdateOrderbookChannelMessage
-    | UnknownOrderbookChannelMessage;
 
-export enum OrderbookChannelMessageTypes {
+export enum OrdersChannelMessageTypes {
-    Snapshot = 'snapshot',
     Update = 'update',
     Unknown = 'unknown',
 }
 
-export interface SnapshotOrderbookChannelMessage {
+export interface UpdateOrdersChannelMessage {
-    type: OrderbookChannelMessageTypes.Snapshot;
+    type: OrdersChannelMessageTypes.Update;
-    requestId: number;
+    requestId: string;
-    payload: OrderbookResponse;
+    payload: APIOrder[];
 }
 
-export interface UpdateOrderbookChannelMessage {
+export interface UnknownOrdersChannelMessage {
-    type: OrderbookChannelMessageTypes.Update;
+    type: OrdersChannelMessageTypes.Unknown;
-    requestId: number;
+    requestId: string;
-    payload: SignedOrder;
-}
-
-export interface UnknownOrderbookChannelMessage {
-    type: OrderbookChannelMessageTypes.Unknown;
-    requestId: number;
     payload: undefined;
 }
 
@@ -83,60 +65,86 @@ export enum WebsocketClientEventType {
     ConnectFailed = 'connectFailed',
 }
 
-export interface TokenPairsRequestOpts {
+export type OrdersResponse = PaginatedCollection<APIOrder>;
-    tokenA?: string;
+
-    tokenB?: string;
+export interface APIOrder {
+    order: SignedOrder;
+    metaData: object;
 }
 
-export interface TokenPairsItem {
+export interface AssetPairsRequestOpts {
-    tokenA: TokenTradeInfo;
+    assetDataA?: string;
-    tokenB: TokenTradeInfo;
+    assetDataB?: string;
 }
 
-export interface TokenTradeInfo {
+export type AssetPairsResponse = PaginatedCollection<AssetPairsItem>;
-    address: string;
+
+export interface AssetPairsItem {
+    assetDataA: Asset;
+    assetDataB: Asset;
+}
+
+export interface Asset {
+    assetData: string;
     minAmount: BigNumber;
     maxAmount: BigNumber;
     precision: number;
 }
 
 export interface OrdersRequestOpts {
-    exchangeContractAddress?: string;
+    makerAssetProxyId?: string;
-    tokenAddress?: string;
+    takerAssetProxyId?: string;
-    makerTokenAddress?: string;
+    makerAssetAddress?: string;
-    takerTokenAddress?: string;
+    takerAssetAddress?: string;
-    maker?: string;
+    exchangeAddress?: string;
-    taker?: string;
+    senderAddress?: string;
-    trader?: string;
+    makerAssetData?: string;
-    feeRecipient?: string;
+    takerAssetData?: string;
+    makerAddress?: string;
+    takerAddress?: string;
+    traderAddress?: string;
+    feeRecipientAddress?: string;
 }
 
 export interface OrderbookRequest {
-    baseTokenAddress: string;
+    baseAssetData: string;
-    quoteTokenAddress: string;
+    quoteAssetData: string;
 }
 
 export interface OrderbookResponse {
-    bids: SignedOrder[];
+    bids: PaginatedCollection<APIOrder>;
-    asks: SignedOrder[];
+    asks: PaginatedCollection<APIOrder>;
 }
 
-export interface FeesRequest {
+export interface PaginatedCollection<T> {
-    exchangeContractAddress: string;
+    total: number;
-    maker: string;
+    page: number;
-    taker: string;
+    perPage: number;
-    makerTokenAddress: string;
+    records: T[];
-    takerTokenAddress: string;
-    makerTokenAmount: BigNumber;
-    takerTokenAmount: BigNumber;
-    expirationUnixTimestampSec: BigNumber;
-    salt: BigNumber;
 }
 
-export interface FeesResponse {
+export interface OrderConfigRequest {
-    feeRecipient: string;
+    makerAddress: string;
+    takerAddress: string;
+    makerAssetAmount: string;
+    takerAssetAmount: string;
+    makerAssetData: string;
+    takerAssetData: string;
+    exchangeAddress: string;
+    expirationTimeSeconds: string;
+}
+
+export interface OrderConfigResponse {
     makerFee: BigNumber;
     takerFee: BigNumber;
+    feeRecipientAddress: string;
+    senderAddress: string;
+}
+
+export type FeeRecipientsResponse = PaginatedCollection<string>;
+
+export interface RequestOpts {
+    networkId?: number;
 }
 
 export interface PagedRequestOpts {

packages/connect/src/utils/assert.ts

@@ -10,15 +10,14 @@ import * as _ from 'lodash';
 
 export const assert = {
     ...sharedAssert,
-    isOrderbookChannelSubscriptionOpts(variableName: string, subscriptionOpts: any): void {
+    isOrdersChannelSubscriptionOpts(variableName: string, subscriptionOpts: any): void {
         sharedAssert.doesConformToSchema(
             variableName,
             subscriptionOpts,
-            schemas.relayerApiOrderbookChannelSubscribePayload,
+            schemas.relayerApiOrdersChannelSubscribePayload,
         );
     },
-    isOrderbookChannelHandler(variableName: string, handler: any): void {
+    isOrdersChannelHandler(variableName: string, handler: any): void {
-        sharedAssert.isFunction(`${variableName}.onSnapshot`, _.get(handler, 'onSnapshot'));
         sharedAssert.isFunction(`${variableName}.onUpdate`, _.get(handler, 'onUpdate'));
         sharedAssert.isFunction(`${variableName}.onError`, _.get(handler, 'onError'));
         sharedAssert.isFunction(`${variableName}.onClose`, _.get(handler, 'onClose'));

packages/connect/src/utils/orderbook_channel_message_parser.ts

@@ -1,43 +0,0 @@
-import { assert } from '@0xproject/assert';
-import { schemas } from '@0xproject/json-schemas';
-import * as _ from 'lodash';
-
-import { OrderbookChannelMessage, OrderbookChannelMessageTypes } from '../types';
-
-import { relayerResponseJsonParsers } from './relayer_response_json_parsers';
-
-export const orderbookChannelMessageParser = {
-    parse(utf8Data: string): OrderbookChannelMessage {
-        // parse the message
-        const messageObj = JSON.parse(utf8Data);
-        // ensure we have a type parameter to switch on
-        const type: string = _.get(messageObj, 'type');
-        assert.assert(!_.isUndefined(type), `Message is missing a type parameter: ${utf8Data}`);
-        assert.isString('type', type);
-        // ensure we have a request id for the resulting message
-        const requestId: number = _.get(messageObj, 'requestId');
-        assert.assert(!_.isUndefined(requestId), `Message is missing a requestId parameter: ${utf8Data}`);
-        assert.isNumber('requestId', requestId);
-        switch (type) {
-            case OrderbookChannelMessageTypes.Snapshot: {
-                assert.doesConformToSchema('message', messageObj, schemas.relayerApiOrderbookChannelSnapshotSchema);
-                const orderbookJson = messageObj.payload;
-                const orderbook = relayerResponseJsonParsers.parseOrderbookResponseJson(orderbookJson);
-                return _.assign(messageObj, { payload: orderbook });
-            }
-            case OrderbookChannelMessageTypes.Update: {
-                assert.doesConformToSchema('message', messageObj, schemas.relayerApiOrderbookChannelUpdateSchema);
-                const orderJson = messageObj.payload;
-                const order = relayerResponseJsonParsers.parseOrderJson(orderJson);
-                return _.assign(messageObj, { payload: order });
-            }
-            default: {
-                return {
-                    type: OrderbookChannelMessageTypes.Unknown,
-                    requestId,
-                    payload: undefined,
-                };
-            }
-        }
-    },
-};

packages/connect/src/utils/orders_channel_message_parser.ts

@@ -0,0 +1,37 @@
+import { assert } from '@0xproject/assert';
+import { schemas } from '@0xproject/json-schemas';
+import * as _ from 'lodash';
+
+import { OrdersChannelMessage, OrdersChannelMessageTypes } from '../types';
+
+import { relayerResponseJsonParsers } from './relayer_response_json_parsers';
+
+export const ordersChannelMessageParser = {
+    parse(utf8Data: string): OrdersChannelMessage {
+        // parse the message
+        const messageObj = JSON.parse(utf8Data);
+        // ensure we have a type parameter to switch on
+        const type: string = _.get(messageObj, 'type');
+        assert.assert(!_.isUndefined(type), `Message is missing a type parameter: ${utf8Data}`);
+        assert.isString('type', type);
+        // ensure we have a request id for the resulting message
+        const requestId: string = _.get(messageObj, 'requestId');
+        assert.assert(!_.isUndefined(requestId), `Message is missing a requestId parameter: ${utf8Data}`);
+        assert.isString('requestId', requestId);
+        switch (type) {
+            case OrdersChannelMessageTypes.Update: {
+                assert.doesConformToSchema('message', messageObj, schemas.relayerApiOrdersChannelUpdateSchema);
+                const ordersJson = messageObj.payload;
+                const orders = relayerResponseJsonParsers.parseAPIOrdersJson(ordersJson);
+                return _.assign(messageObj, { payload: orders });
+            }
+            default: {
+                return {
+                    type: OrdersChannelMessageTypes.Unknown,
+                    requestId,
+                    payload: undefined,
+                };
+            }
+        }
+    },
+};

packages/connect/src/utils/relayer_response_json_parsers.ts

@@ -1,37 +1,49 @@
 import { assert } from '@0xproject/assert';
 import { schemas } from '@0xproject/json-schemas';
-import { SignedOrder } from '@0xproject/types';
 
-import { FeesResponse, OrderbookResponse, TokenPairsItem } from '../types';
+import {
+    APIOrder,
+    AssetPairsItem,
+    AssetPairsResponse,
+    OrderbookResponse,
+    OrderConfigResponse,
+    OrdersResponse,
+} from '../types';
 
 import { typeConverters } from './type_converters';
 
 export const relayerResponseJsonParsers = {
-    parseTokenPairsJson(json: any): TokenPairsItem[] {
+    parseAssetDataPairsJson(json: any): AssetPairsResponse {
-        assert.doesConformToSchema('tokenPairs', json, schemas.relayerApiTokenPairsResponseSchema);
+        assert.doesConformToSchema('assetDataPairsResponse', json, schemas.relayerApiAssetDataPairsResponseSchema);
-        return json.map((tokenPair: any) => {
+        return { ...json, records: relayerResponseJsonParsers.parseAssetPairsItemsJson(json.records) };
-            return typeConverters.convertStringsFieldsToBigNumbers(tokenPair, [
+    },
-                'tokenA.minAmount',
+    parseAssetPairsItemsJson(json: any): AssetPairsItem[] {
-                'tokenA.maxAmount',
+        return json.map((assetDataPair: any) => {
-                'tokenB.minAmount',
+            return typeConverters.convertStringsFieldsToBigNumbers(assetDataPair, [
-                'tokenB.maxAmount',
+                'assetDataA.minAmount',
+                'assetDataA.maxAmount',
+                'assetDataB.minAmount',
+                'assetDataB.maxAmount',
             ]);
         });
     },
-    parseOrdersJson(json: any): SignedOrder[] {
+    parseOrdersJson(json: any): OrdersResponse {
-        assert.doesConformToSchema('orders', json, schemas.signedOrdersSchema);
+        assert.doesConformToSchema('relayerApiOrdersResponse', json, schemas.relayerApiOrdersResponseSchema);
-        return json.map((order: object) => typeConverters.convertOrderStringFieldsToBigNumber(order));
+        return { ...json, records: relayerResponseJsonParsers.parseAPIOrdersJson(json.records) };
     },
-    parseOrderJson(json: any): SignedOrder {
+    parseAPIOrdersJson(json: any): APIOrder[] {
-        assert.doesConformToSchema('order', json, schemas.signedOrderSchema);
+        return json.map(relayerResponseJsonParsers.parseAPIOrderJson.bind(relayerResponseJsonParsers));
-        return typeConverters.convertOrderStringFieldsToBigNumber(json);
+    },
+    parseAPIOrderJson(json: any): APIOrder {
+        assert.doesConformToSchema('relayerApiOrder', json, schemas.relayerApiOrderSchema);
+        return typeConverters.convertAPIOrderStringFieldsToBigNumber(json);
     },
     parseOrderbookResponseJson(json: any): OrderbookResponse {
-        assert.doesConformToSchema('orderBook', json, schemas.relayerApiOrderBookResponseSchema);
+        assert.doesConformToSchema('orderBookResponse', json, schemas.relayerApiOrderbookResponseSchema);
         return typeConverters.convertOrderbookStringFieldsToBigNumber(json);
     },
-    parseFeesResponseJson(json: any): FeesResponse {
+    parseOrderConfigResponseJson(json: any): OrderConfigResponse {
-        assert.doesConformToSchema('fees', json, schemas.relayerApiFeesResponseSchema);
+        assert.doesConformToSchema('orderConfigResponse', json, schemas.relayerApiOrderConfigResponseSchema);
         return typeConverters.convertStringsFieldsToBigNumbers(json, ['makerFee', 'takerFee']);
     },
 };

packages/connect/src/utils/type_converters.ts

@@ -1,29 +1,47 @@
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 
+import { APIOrder } from '../types';
+
 export const typeConverters = {
     convertOrderbookStringFieldsToBigNumber(orderbook: any): any {
         const bids = _.get(orderbook, 'bids', []);
         const asks = _.get(orderbook, 'asks', []);
-        return {
+        const convertedBids = {
-            bids: bids.map((order: any) => typeConverters.convertOrderStringFieldsToBigNumber(order)),
+            ...bids,
-            asks: asks.map((order: any) => typeConverters.convertOrderStringFieldsToBigNumber(order)),
+            records: bids.records.map((order: any) => typeConverters.convertAPIOrderStringFieldsToBigNumber(order)),
         };
+        const convertedAsks = {
+            ...asks,
+            records: asks.records.map((order: any) => typeConverters.convertAPIOrderStringFieldsToBigNumber(order)),
+        };
+        return {
+            bids: convertedBids,
+            asks: convertedAsks,
+        };
+    },
+    convertAPIOrderStringFieldsToBigNumber(apiOrder: any): APIOrder {
+        return { ...apiOrder, order: typeConverters.convertOrderStringFieldsToBigNumber(apiOrder.order) };
     },
     convertOrderStringFieldsToBigNumber(order: any): any {
         return typeConverters.convertStringsFieldsToBigNumbers(order, [
-            'makerTokenAmount',
+            'makerAssetAmount',
-            'takerTokenAmount',
+            'takerAssetAmount',
             'makerFee',
             'takerFee',
-            'expirationUnixTimestampSec',
+            'expirationTimeSeconds',
             'salt',
         ]);
     },
     convertStringsFieldsToBigNumbers(obj: any, fields: string[]): any {
         const result = _.assign({}, obj);
         _.each(fields, field => {
-            _.update(result, field, (value: string) => new BigNumber(value));
+            _.update(result, field, (value: string) => {
+                if (_.isUndefined(value)) {
+                    throw new Error(`Could not find field '${field}' while converting string fields to BigNumber.`);
+                }
+                return new BigNumber(value);
+            });
         });
         return result;
     },

packages/connect/src/ws_orders_channel.ts

@@ -1,32 +1,32 @@
 import * as _ from 'lodash';
+import { v4 as uuid } from 'uuid';
 import * as WebSocket from 'websocket';
 
-import {
+import { OrdersChannel, OrdersChannelHandler, OrdersChannelMessageTypes, OrdersChannelSubscriptionOpts } from './types';
-    OrderbookChannel,
-    OrderbookChannelHandler,
-    OrderbookChannelMessageTypes,
-    OrderbookChannelSubscriptionOpts,
-} from './types';
 import { assert } from './utils/assert';
-import { orderbookChannelMessageParser } from './utils/orderbook_channel_message_parser';
+import { ordersChannelMessageParser } from './utils/orders_channel_message_parser';
+
+export interface OrdersChannelSubscriptionOptsMap {
+    [key: string]: OrdersChannelSubscriptionOpts;
+}
 
 /**
  * This class includes all the functionality related to interacting with a websocket endpoint
  * that implements the standard relayer API v0
  */
-export class WebSocketOrderbookChannel implements OrderbookChannel {
+export class WebSocketOrdersChannel implements OrdersChannel {
     private readonly _client: WebSocket.w3cwebsocket;
-    private readonly _handler: OrderbookChannelHandler;
+    private readonly _handler: OrdersChannelHandler;
-    private readonly _subscriptionOptsList: OrderbookChannelSubscriptionOpts[] = [];
+    private readonly _subscriptionOptsMap: OrdersChannelSubscriptionOptsMap = {};
     /**
-     * Instantiates a new WebSocketOrderbookChannel instance
+     * Instantiates a new WebSocketOrdersChannel instance
      * @param   client               A WebSocket client
-     * @param   handler              An OrderbookChannelHandler instance that responds to various
+     * @param   handler              An OrdersChannelHandler instance that responds to various
      *                               channel updates
-     * @return  An instance of WebSocketOrderbookChannel
+     * @return  An instance of WebSocketOrdersChannel
      */
-    constructor(client: WebSocket.w3cwebsocket, handler: OrderbookChannelHandler) {
+    constructor(client: WebSocket.w3cwebsocket, handler: OrdersChannelHandler) {
-        assert.isOrderbookChannelHandler('handler', handler);
+        assert.isOrdersChannelHandler('handler', handler);
         // set private members
         this._client = client;
         this._handler = handler;
@@ -43,18 +43,18 @@ export class WebSocketOrderbookChannel implements OrderbookChannel {
     }
     /**
      * Subscribe to orderbook snapshots and updates from the websocket
-     * @param   subscriptionOpts     An OrderbookChannelSubscriptionOpts instance describing which
+     * @param   subscriptionOpts     An OrdersChannelSubscriptionOpts instance describing which
-     *                               token pair to subscribe to
+     *                               assetData pair to subscribe to
      */
-    public subscribe(subscriptionOpts: OrderbookChannelSubscriptionOpts): void {
+    public subscribe(subscriptionOpts: OrdersChannelSubscriptionOpts): void {
-        assert.isOrderbookChannelSubscriptionOpts('subscriptionOpts', subscriptionOpts);
+        assert.isOrdersChannelSubscriptionOpts('subscriptionOpts', subscriptionOpts);
         assert.assert(this._client.readyState === WebSocket.w3cwebsocket.OPEN, 'WebSocket connection is closed');
-        this._subscriptionOptsList.push(subscriptionOpts);
+        const requestId = uuid();
-        // TODO: update requestId management to use UUIDs for v2
+        this._subscriptionOptsMap[requestId] = subscriptionOpts;
         const subscribeMessage = {
             type: 'subscribe',
-            channel: 'orderbook',
+            channel: 'orders',
-            requestId: this._subscriptionOptsList.length - 1,
+            requestId,
             payload: subscriptionOpts,
         };
         this._client.send(JSON.stringify(subscribeMessage));
@@ -72,8 +72,8 @@ export class WebSocketOrderbookChannel implements OrderbookChannel {
         }
         try {
             const data = message.data;
-            const parserResult = orderbookChannelMessageParser.parse(data);
+            const parserResult = ordersChannelMessageParser.parse(data);
-            const subscriptionOpts = this._subscriptionOptsList[parserResult.requestId];
+            const subscriptionOpts = this._subscriptionOptsMap[parserResult.requestId];
             if (_.isUndefined(subscriptionOpts)) {
                 this._handler.onError(
                     this,
@@ -82,11 +82,7 @@ export class WebSocketOrderbookChannel implements OrderbookChannel {
                 return;
             }
             switch (parserResult.type) {
-                case OrderbookChannelMessageTypes.Snapshot: {
+                case OrdersChannelMessageTypes.Update: {
-                    this._handler.onSnapshot(this, subscriptionOpts, parserResult.payload);
-                    break;
-                }
-                case OrderbookChannelMessageTypes.Update: {
                     this._handler.onUpdate(this, subscriptionOpts, parserResult.payload);
                     break;
                 }

packages/connect/test/fixtures/standard_relayer_api/asset_pairs.json

@@ -0,0 +1,21 @@
+{
+    "total": 43,
+    "page": 1,
+    "perPage": 100,
+    "records": [
+        {
+            "assetDataA": {
+                "minAmount": "0",
+                "maxAmount": "10000000000000000000",
+                "precision": 5,
+                "assetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d"
+            },
+            "assetDataB": {
+                "minAmount": "0",
+                "maxAmount": "50000000000000000000",
+                "precision": 5,
+                "assetData": "0x0257179264389b814a946f3e92105513705ca6b990"
+            }
+        }
+    ]
+}

packages/connect/test/fixtures/standard_relayer_api/asset_pairs.ts

@@ -0,0 +1,25 @@
+import { BigNumber } from '@0xproject/utils';
+
+import { AssetPairsResponse } from '../../../src/types';
+
+export const assetDataPairsResponse: AssetPairsResponse = {
+    total: 43,
+    page: 1,
+    perPage: 100,
+    records: [
+        {
+            assetDataA: {
+                minAmount: new BigNumber('0'),
+                maxAmount: new BigNumber('10000000000000000000'),
+                precision: 5,
+                assetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
+            },
+            assetDataB: {
+                minAmount: new BigNumber('0'),
+                maxAmount: new BigNumber('50000000000000000000'),
+                precision: 5,
+                assetData: '0x0257179264389b814a946f3e92105513705ca6b990',
+            },
+        },
+    ],
+};

packages/connect/test/fixtures/standard_relayer_api/fee_recipients.json

@@ -0,0 +1,10 @@
+{
+    "total": 3,
+    "page": 1,
+    "perPage": 10,
+    "records": [
+        "0x6ec92694ea172ebc430c30fa31de87620967a082",
+        "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+        "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32"
+    ]
+}

packages/connect/test/fixtures/standard_relayer_api/fee_recipients.ts

@@ -0,0 +1,12 @@
+import { FeeRecipientsResponse } from '../../../src/types';
+
+export const feeRecipientsResponse: FeeRecipientsResponse = {
+    total: 3,
+    page: 1,
+    perPage: 10,
+    records: [
+        '0x6ec92694ea172ebc430c30fa31de87620967a082',
+        '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+        '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+    ],
+};

packages/connect/test/fixtures/standard_relayer_api/fees.json

@@ -1,5 +0,0 @@
-{
-    "feeRecipient": "0x323b5d4c32345ced77393b3530b1eed0f346429d",
-    "makerFee": "10000000000000000",
-    "takerFee": "30000000000000000"
-}

packages/connect/test/fixtures/standard_relayer_api/fees.ts

@@ -1,9 +0,0 @@
-import { BigNumber } from '@0xproject/utils';
-
-import { FeesResponse } from '../../../src/types';
-
-export const feesResponse: FeesResponse = {
-    feeRecipient: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
-    makerFee: new BigNumber('10000000000000000'),
-    takerFee: new BigNumber('30000000000000000'),
-};

packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.json

@@ -1,19 +1,19 @@
 {
-    "maker": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+    "order": {
-    "taker": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
+        "makerAddress": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
-    "makerFee": "100000000000000",
+        "takerAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-    "takerFee": "200000000000000",
+        "feeRecipientAddress": "0xb046140686d052fff581f63f8136cce132e857da",
-    "makerTokenAmount": "10000000000000000",
+        "senderAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-    "takerTokenAmount": "20000000000000000",
+        "makerAssetAmount": "10000000000000000",
-    "makerTokenAddress": "0x323b5d4c32345ced77393b3530b1eed0f346429d",
+        "takerAssetAmount": "20000000000000000",
-    "takerTokenAddress": "0xef7fff64389b814a946f3e92105513705ca6b990",
+        "makerFee": "100000000000000",
-    "salt": "256",
+        "takerFee": "200000000000000",
-    "feeRecipient": "0xb046140686d052fff581f63f8136cce132e857da",
+        "expirationTimeSeconds": "1532560590",
-    "exchangeContractAddress": "0x12459c951127e0c374ff9105dda097662a027093",
+        "salt": "1532559225",
-    "expirationUnixTimestampSec": "42",
+        "makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
-    "ecSignature": {
+        "takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
-        "v": 27,
+        "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
-        "r": "0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
+        "signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33"
-        "s": "0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254"
+    },
-    }
+    "metaData": {}
 }

packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.ts

@@ -1,21 +1,21 @@
 import { BigNumber } from '@0xproject/utils';
 
 export const orderResponse = {
-    maker: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+    order: {
-    taker: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+        makerAddress: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
-    makerFee: new BigNumber('100000000000000'),
+        takerAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-    takerFee: new BigNumber('200000000000000'),
+        feeRecipientAddress: '0xb046140686d052fff581f63f8136cce132e857da',
-    makerTokenAmount: new BigNumber('10000000000000000'),
+        senderAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-    takerTokenAmount: new BigNumber('20000000000000000'),
+        makerAssetAmount: new BigNumber('10000000000000000'),
-    makerTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+        takerAssetAmount: new BigNumber('20000000000000000'),
-    takerTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
+        makerFee: new BigNumber('100000000000000'),
-    salt: new BigNumber('256'),
+        takerFee: new BigNumber('200000000000000'),
-    feeRecipient: '0xb046140686d052fff581f63f8136cce132e857da',
+        expirationTimeSeconds: new BigNumber('1532560590'),
-    exchangeContractAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+        salt: new BigNumber('1532559225'),
-    expirationUnixTimestampSec: new BigNumber('42'),
+        makerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
-    ecSignature: {
+        takerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
-        v: 27,
+        exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093',
-        r: '0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
+        signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
-        s: '0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254',
     },
+    metaData: {},
 };

packages/connect/test/fixtures/standard_relayer_api/order_config.json

@@ -0,0 +1,6 @@
+{
+    "senderAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
+    "feeRecipientAddress": "0xb046140686d052fff581f63f8136cce132e857da",
+    "makerFee": "100000000000000",
+    "takerFee": "200000000000000"
+}

packages/connect/test/fixtures/standard_relayer_api/order_config.ts

@@ -0,0 +1,10 @@
+import { BigNumber } from '@0xproject/utils';
+
+import { OrderConfigResponse } from '../../../src/types';
+
+export const orderConfigResponse: OrderConfigResponse = {
+    senderAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+    feeRecipientAddress: '0xb046140686d052fff581f63f8136cce132e857da',
+    makerFee: new BigNumber('100000000000000'),
+    takerFee: new BigNumber('200000000000000'),
+};

packages/connect/test/fixtures/standard_relayer_api/orderbook.json

@@ -1,44 +1,54 @@
 {
-    "bids": [
+    "bids": {
-        {
+        "total": 325,
-            "maker": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+        "page": 2,
-            "taker": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
+        "perPage": 100,
-            "makerFee": "100000000000000",
+        "records": [
-            "takerFee": "200000000000000",
+            {
-            "makerTokenAmount": "10000000000000000",
+                "order": {
-            "takerTokenAmount": "20000000000000000",
+                    "makerAddress": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
-            "makerTokenAddress": "0x323b5d4c32345ced77393b3530b1eed0f346429d",
+                    "takerAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-            "takerTokenAddress": "0xef7fff64389b814a946f3e92105513705ca6b990",
+                    "feeRecipientAddress": "0xb046140686d052fff581f63f8136cce132e857da",
-            "salt": "256",
+                    "senderAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-            "feeRecipient": "0xb046140686d052fff581f63f8136cce132e857da",
+                    "makerAssetAmount": "10000000000000000",
-            "exchangeContractAddress": "0x12459c951127e0c374ff9105dda097662a027093",
+                    "takerAssetAmount": "20000000000000000",
-            "expirationUnixTimestampSec": "42",
+                    "makerFee": "100000000000000",
-            "ecSignature": {
+                    "takerFee": "200000000000000",
-                "v": 27,
+                    "expirationTimeSeconds": "1532560590",
-                "r": "0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
+                    "salt": "1532559225",
-                "s": "0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254"
+                    "makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
+                    "takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
+                    "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
+                    "signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33"
+                },
+                "metaData": {}
             }
-        }
+        ]
-    ],
+    },
-    "asks": [
+    "asks": {
-        {
+        "total": 500,
-            "maker": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+        "page": 2,
-            "taker": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
+        "perPage": 100,
-            "makerFee": "100000000000000",
+        "records": [
-            "takerFee": "200000000000000",
+            {
-            "makerTokenAmount": "10000000000000000",
+                "order": {
-            "takerTokenAmount": "20000000000000000",
+                    "makerAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-            "makerTokenAddress": "0x323b5d4c32345ced77393b3530b1eed0f346429d",
+                    "takerAddress": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
-            "takerTokenAddress": "0xef7fff64389b814a946f3e92105513705ca6b990",
+                    "feeRecipientAddress": "0xb046140686d052fff581f63f8136cce132e857da",
-            "salt": "256",
+                    "senderAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-            "feeRecipient": "0xb046140686d052fff581f63f8136cce132e857da",
+                    "makerAssetAmount": "20000000000000000",
-            "exchangeContractAddress": "0x12459c951127e0c374ff9105dda097662a027093",
+                    "takerAssetAmount": "10000000000000000",
-            "expirationUnixTimestampSec": "42",
+                    "makerFee": "200000000000000",
-            "ecSignature": {
+                    "takerFee": "100000000000000",
-                "v": 27,
+                    "expirationTimeSeconds": "1532560590",
-                "r": "0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
+                    "salt": "1532559225",
-                "s": "0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254"
+                    "makerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
+                    "takerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
+                    "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
+                    "signature": "0x013842a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b3518891"
+                },
+                "metaData": {}
             }
-        }
+        ]
-    ]
+    }
 }

packages/connect/test/fixtures/standard_relayer_api/orderbook.ts

@@ -1,46 +1,58 @@
 import { BigNumber } from '@0xproject/utils';
 
-export const orderbookResponse = {
+import { OrderbookResponse } from '../../../src/types';
-    bids: [
+
-        {
+export const orderbookResponse: OrderbookResponse = {
-            maker: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+    bids: {
-            taker: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+        total: 325,
-            makerFee: new BigNumber('100000000000000'),
+        page: 2,
-            takerFee: new BigNumber('200000000000000'),
+        perPage: 100,
-            makerTokenAmount: new BigNumber('10000000000000000'),
+        records: [
-            takerTokenAmount: new BigNumber('20000000000000000'),
+            {
-            makerTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+                order: {
-            takerTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
+                    makerAddress: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
-            salt: new BigNumber('256'),
+                    takerAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-            feeRecipient: '0xb046140686d052fff581f63f8136cce132e857da',
+                    feeRecipientAddress: '0xb046140686d052fff581f63f8136cce132e857da',
-            exchangeContractAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+                    senderAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-            expirationUnixTimestampSec: new BigNumber('42'),
+                    makerAssetAmount: new BigNumber('10000000000000000'),
-            ecSignature: {
+                    takerAssetAmount: new BigNumber('20000000000000000'),
-                v: 27,
+                    makerFee: new BigNumber('100000000000000'),
-                r: '0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
+                    takerFee: new BigNumber('200000000000000'),
-                s: '0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254',
+                    expirationTimeSeconds: new BigNumber('1532560590'),
+                    salt: new BigNumber('1532559225'),
+                    makerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
+                    takerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
+                    exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+                    signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
+                },
+                metaData: {},
             },
-        },
+        ],
-    ],
+    },
-    asks: [
+    asks: {
-        {
+        total: 500,
-            maker: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+        page: 2,
-            taker: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+        perPage: 100,
-            makerFee: new BigNumber('100000000000000'),
+        records: [
-            takerFee: new BigNumber('200000000000000'),
+            {
-            makerTokenAmount: new BigNumber('10000000000000000'),
+                order: {
-            takerTokenAmount: new BigNumber('20000000000000000'),
+                    makerAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-            makerTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+                    takerAddress: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
-            takerTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
+                    feeRecipientAddress: '0xb046140686d052fff581f63f8136cce132e857da',
-            salt: new BigNumber('256'),
+                    senderAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-            feeRecipient: '0xb046140686d052fff581f63f8136cce132e857da',
+                    makerAssetAmount: new BigNumber('20000000000000000'),
-            exchangeContractAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+                    takerAssetAmount: new BigNumber('10000000000000000'),
-            expirationUnixTimestampSec: new BigNumber('42'),
+                    makerFee: new BigNumber('200000000000000'),
-            ecSignature: {
+                    takerFee: new BigNumber('100000000000000'),
-                v: 27,
+                    expirationTimeSeconds: new BigNumber('1532560590'),
-                r: '0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
+                    salt: new BigNumber('1532559225'),
-                s: '0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254',
+                    makerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
+                    takerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
+                    exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+                    signature: '0x013842a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b3518891',
+                },
+                metaData: {},
             },
-        },
+        ],
-    ],
+    },
 };

packages/connect/test/fixtures/standard_relayer_api/orders.json

@@ -1,21 +1,26 @@
-[
+{
-    {
+    "total": 984,
-        "maker": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+    "page": 1,
-        "taker": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
+    "perPage": 100,
-        "makerFee": "100000000000000",
+    "records": [
-        "takerFee": "200000000000000",
+        {
-        "makerTokenAmount": "10000000000000000",
+            "order": {
-        "takerTokenAmount": "20000000000000000",
+                "makerAddress": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
-        "makerTokenAddress": "0x323b5d4c32345ced77393b3530b1eed0f346429d",
+                "takerAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-        "takerTokenAddress": "0xef7fff64389b814a946f3e92105513705ca6b990",
+                "feeRecipientAddress": "0xb046140686d052fff581f63f8136cce132e857da",
-        "salt": "256",
+                "senderAddress": "0xa2b31dacf30a9c50ca473337c01d8a201ae33e32",
-        "feeRecipient": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+                "makerAssetAmount": "10000000000000000",
-        "exchangeContractAddress": "0x9e56625509c2f60af937f23b7b532600390e8c8b",
+                "takerAssetAmount": "20000000000000000",
-        "expirationUnixTimestampSec": "42",
+                "makerFee": "100000000000000",
-        "ecSignature": {
+                "takerFee": "200000000000000",
-            "v": 27,
+                "expirationTimeSeconds": "1532560590",
-            "r": "0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
+                "salt": "1532559225",
-            "s": "0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254"
+                "makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
+                "takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
+                "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
+                "signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33"
+            },
+            "metaData": {}
         }
-    }
+    ]
-]
+}

packages/connect/test/fixtures/standard_relayer_api/orders.ts

@@ -1,23 +1,30 @@
 import { BigNumber } from '@0xproject/utils';
 
-export const ordersResponse = [
+import { OrdersResponse } from '../../../src/types';
-    {
+
-        maker: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+export const ordersResponse: OrdersResponse = {
-        taker: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+    total: 984,
-        makerFee: new BigNumber('100000000000000'),
+    page: 1,
-        takerFee: new BigNumber('200000000000000'),
+    perPage: 100,
-        makerTokenAmount: new BigNumber('10000000000000000'),
+    records: [
-        takerTokenAmount: new BigNumber('20000000000000000'),
+        {
-        makerTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+            order: {
-        takerTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
+                makerAddress: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
-        salt: new BigNumber('256'),
+                takerAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-        feeRecipient: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+                feeRecipientAddress: '0xb046140686d052fff581f63f8136cce132e857da',
-        exchangeContractAddress: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+                senderAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-        expirationUnixTimestampSec: new BigNumber('42'),
+                makerAssetAmount: new BigNumber('10000000000000000'),
-        ecSignature: {
+                takerAssetAmount: new BigNumber('20000000000000000'),
-            v: 27,
+                makerFee: new BigNumber('100000000000000'),
-            r: '0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
+                takerFee: new BigNumber('200000000000000'),
-            s: '0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254',
+                expirationTimeSeconds: new BigNumber('1532560590'),
+                salt: new BigNumber('1532559225'),
+                makerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
+                takerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
+                exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+                signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
+            },
+            metaData: {},
         },
-    },
+    ],
-];
+};

packages/connect/test/fixtures/standard_relayer_api/snapshot_orderbook_channel_message.ts

@@ -1,17 +0,0 @@
-import * as orderbookJSON from './orderbook.json';
-
-const orderbookJsonString = JSON.stringify(orderbookJSON);
-
-export const snapshotOrderbookChannelMessage = `{
-    "type": "snapshot",
-    "channel": "orderbook",
-    "requestId": 1,
-    "payload": ${orderbookJsonString}
-}`;
-
-export const malformedSnapshotOrderbookChannelMessage = `{
-    "type": "snapshot",
-    "channel": "orderbook",
-    "requestId": 1,
-    "payload": {}
-}`;

packages/connect/test/fixtures/standard_relayer_api/token_pairs.json

@@ -1,16 +0,0 @@
-[
-    {
-        "tokenA": {
-            "address": "0x323b5d4c32345ced77393b3530b1eed0f346429d",
-            "minAmount": "0",
-            "maxAmount": "10000000000000000000",
-            "precision": 5
-        },
-        "tokenB": {
-            "address": "0xef7fff64389b814a946f3e92105513705ca6b990",
-            "minAmount": "0",
-            "maxAmount": "50000000000000000000",
-            "precision": 5
-        }
-    }
-]

packages/connect/test/fixtures/standard_relayer_api/token_pairs.ts

@@ -1,20 +0,0 @@
-import { BigNumber } from '@0xproject/utils';
-
-import { TokenPairsItem } from '../../../src/types';
-
-export const tokenPairsResponse: TokenPairsItem[] = [
-    {
-        tokenA: {
-            address: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
-            minAmount: new BigNumber(0),
-            maxAmount: new BigNumber('10000000000000000000'),
-            precision: 5,
-        },
-        tokenB: {
-            address: '0xef7fff64389b814a946f3e92105513705ca6b990',
-            minAmount: new BigNumber(0),
-            maxAmount: new BigNumber('50000000000000000000'),
-            precision: 5,
-        },
-    },
-];

packages/connect/test/fixtures/standard_relayer_api/unknown_orders_channel_message.ts

@@ -2,9 +2,9 @@ import * as orderResponseJSON from './order/0xabc67323774bdbd24d94f977fa9ac94a50
 
 const orderJSONString = JSON.stringify(orderResponseJSON);
 
-export const unknownOrderbookChannelMessage = `{
+export const unknownOrdersChannelMessage = `{
     "type": "superGoodUpdate",
     "channel": "orderbook",
-    "requestId": 1,
+    "requestId": "6ce8c5a6-5c46-4027-a44a-51831c77b8a1",
-    "payload": ${orderJSONString}
+    "payload": [${orderJSONString}]
 }`;

packages/connect/test/fixtures/standard_relayer_api/update_orderbook_channel_message.ts

@@ -1,17 +0,0 @@
-import * as orderResponseJSON from './order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.json';
-
-const orderJSONString = JSON.stringify(orderResponseJSON);
-
-export const updateOrderbookChannelMessage = `{
-    "type": "update",
-    "channel": "orderbook",
-    "requestId": 1,
-    "payload": ${orderJSONString}
-}`;
-
-export const malformedUpdateOrderbookChannelMessage = `{
-    "type": "update",
-    "channel": "orderbook",
-    "requestId": 1,
-    "payload": {}
-}`;

packages/connect/test/fixtures/standard_relayer_api/update_orders_channel_message.ts

@@ -0,0 +1,17 @@
+import * as apiOrderJSON from './order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.json';
+
+const apiOrderJSONString = JSON.stringify(apiOrderJSON);
+
+export const updateOrdersChannelMessage = `{
+    "type": "update",
+    "channel": "orders",
+    "requestId": "5a1ce3a2-22b9-41e6-a615-68077512e9e2",
+    "payload": [${apiOrderJSONString}]
+}`;
+
+export const malformedUpdateOrdersChannelMessage = `{
+    "type": "update",
+    "channel": "orders",
+    "requestId": "4d8efcee-adde-4475-9601-f0b30962ca2b",
+    "payload": {}
+}`;

packages/connect/test/http_client_test.ts

@@ -1,4 +1,3 @@
-import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as dirtyChai from 'dirty-chai';
@@ -7,16 +6,18 @@ import 'mocha';
 
 import { HttpClient } from '../src/index';
 
-import { feesResponse } from './fixtures/standard_relayer_api/fees';
+import { assetDataPairsResponse } from './fixtures/standard_relayer_api/asset_pairs';
-import * as feesResponseJSON from './fixtures/standard_relayer_api/fees.json';
+import * as assetDataPairsResponseJSON from './fixtures/standard_relayer_api/asset_pairs.json';
+import { feeRecipientsResponse } from './fixtures/standard_relayer_api/fee_recipients';
+import * as feeRecipientsResponseJSON from './fixtures/standard_relayer_api/fee_recipients.json';
 import { orderResponse } from './fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f';
 import * as orderResponseJSON from './fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.json';
+import { orderConfigResponse } from './fixtures/standard_relayer_api/order_config';
+import * as orderConfigResponseJSON from './fixtures/standard_relayer_api/order_config.json';
 import { orderbookResponse } from './fixtures/standard_relayer_api/orderbook';
 import * as orderbookJSON from './fixtures/standard_relayer_api/orderbook.json';
 import { ordersResponse } from './fixtures/standard_relayer_api/orders';
 import * as ordersResponseJSON from './fixtures/standard_relayer_api/orders.json';
-import { tokenPairsResponse } from './fixtures/standard_relayer_api/token_pairs';
-import * as tokenPairsResponseJSON from './fixtures/standard_relayer_api/token_pairs.json';
 
 chai.config.includeStack = true;
 chai.use(dirtyChai);
@@ -26,7 +27,7 @@ const expect = chai.expect;
 describe('HttpClient', () => {
     const relayUrl = 'https://example.com';
     const relayerClient = new HttpClient(relayUrl);
-    afterEach(() => {
+    beforeEach(() => {
         fetchMock.restore();
     });
     describe('#constructor', () => {
@@ -38,47 +39,47 @@ describe('HttpClient', () => {
             expect(sanitizedUrl).to.be.deep.equal(urlWithoutTrailingSlash);
         });
     });
-    describe('#getTokenPairsAsync', () => {
+    describe('#getAssetPairsAsync', () => {
-        const url = `${relayUrl}/token_pairs`;
+        const url = `${relayUrl}/asset_pairs`;
-        it('gets token pairs with default options when none are provided', async () => {
+        it('gets assetData pairs with default options when none are provided', async () => {
-            const urlWithQuery = `${url}?page=1&per_page=100`;
+            fetchMock.get(url, assetDataPairsResponseJSON);
-            fetchMock.get(urlWithQuery, tokenPairsResponseJSON);
+            const assetDataPairs = await relayerClient.getAssetPairsAsync();
-            const tokenPairs = await relayerClient.getTokenPairsAsync();
+            expect(assetDataPairs).to.be.deep.equal(assetDataPairsResponse);
-            expect(tokenPairs).to.be.deep.equal(tokenPairsResponse);
         });
-        it('gets token pairs with specified request options', async () => {
+        it('gets assetData pairs with specified request options', async () => {
-            const tokenAddress = '0x323b5d4c32345ced77393b3530b1eed0f346429d';
+            const assetData = '0xf47261b04c32345ced77393b3530b1eed0f346429d';
-            const tokenPairsRequestOpts = {
+            const assetPairsRequestOpts = {
-                tokenA: tokenAddress,
+                assetDataA: assetData,
                 page: 3,
                 perPage: 50,
+                networkdId: 42,
             };
-            const urlWithQuery = `${url}?page=3&per_page=50&tokenA=${tokenAddress}`;
+            const urlWithQuery = `${url}?assetDataA=${assetData}&networkdId=42&page=3&perPage=50`;
-            fetchMock.get(urlWithQuery, tokenPairsResponseJSON);
+            fetchMock.get(urlWithQuery, assetDataPairsResponseJSON);
-            const tokenPairs = await relayerClient.getTokenPairsAsync(tokenPairsRequestOpts);
+            const assetDataPairs = await relayerClient.getAssetPairsAsync(assetPairsRequestOpts);
-            expect(tokenPairs).to.be.deep.equal(tokenPairsResponse);
+            expect(assetDataPairs).to.be.deep.equal(assetDataPairsResponse);
         });
         it('throws an error for invalid JSON response', async () => {
             fetchMock.get(url, { test: 'dummy' });
-            expect(relayerClient.getTokenPairsAsync()).to.be.rejected();
+            expect(relayerClient.getAssetPairsAsync()).to.be.rejected();
         });
     });
     describe('#getOrdersAsync', () => {
         const url = `${relayUrl}/orders`;
         it('gets orders with default options when none are provided', async () => {
-            const urlWithQuery = `${url}?page=1&per_page=100`;
+            fetchMock.get(url, ordersResponseJSON);
-            fetchMock.get(urlWithQuery, ordersResponseJSON);
             const orders = await relayerClient.getOrdersAsync();
             expect(orders).to.be.deep.equal(ordersResponse);
         });
         it('gets orders with specified request options', async () => {
-            const tokenAddress = '0x323b5d4c32345ced77393b3530b1eed0f346429d';
+            const assetDataAddress = '0x323b5d4c32345ced77393b3530b1eed0f346429d';
             const ordersRequest = {
-                tokenAddress,
+                assetDataAddress,
                 page: 3,
                 perPage: 50,
+                networkdId: 42,
             };
-            const urlWithQuery = `${url}?page=3&per_page=50&tokenAddress=${tokenAddress}`;
+            const urlWithQuery = `${url}?assetDataAddress=${assetDataAddress}&networkdId=42&page=3&perPage=50`;
             fetchMock.get(urlWithQuery, ordersResponseJSON);
             const orders = await relayerClient.getOrdersAsync(ordersRequest);
             expect(orders).to.be.deep.equal(ordersResponse);
@@ -103,26 +104,27 @@ describe('HttpClient', () => {
     });
     describe('#getOrderBookAsync', () => {
         const request = {
-            baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+            baseAssetData: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
-            quoteTokenAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+            quoteAssetData: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
         };
         const url = `${relayUrl}/orderbook`;
         it('gets orderbook with default page options when none are provided', async () => {
-            const urlWithQuery = `${url}?baseTokenAddress=${
+            const urlWithQuery = `${url}?baseAssetData=${request.baseAssetData}&quoteAssetData=${
-                request.baseTokenAddress
+                request.quoteAssetData
-            }&page=1&per_page=100&quoteTokenAddress=${request.quoteTokenAddress}`;
+            }`;
             fetchMock.get(urlWithQuery, orderbookJSON);
             const orderbook = await relayerClient.getOrderbookAsync(request);
             expect(orderbook).to.be.deep.equal(orderbookResponse);
         });
         it('gets orderbook with specified page options', async () => {
-            const urlWithQuery = `${url}?baseTokenAddress=${
+            const urlWithQuery = `${url}?baseAssetData=${
-                request.baseTokenAddress
+                request.baseAssetData
-            }&page=3&per_page=50&quoteTokenAddress=${request.quoteTokenAddress}`;
+            }&networkId=42&page=3&perPage=50&quoteAssetData=${request.quoteAssetData}`;
             fetchMock.get(urlWithQuery, orderbookJSON);
             const pagedRequestOptions = {
                 page: 3,
                 perPage: 50,
+                networkId: 42,
             };
             const orderbook = await relayerClient.getOrderbookAsync(request, pagedRequestOptions);
             expect(orderbook).to.be.deep.equal(orderbookResponse);
@@ -132,39 +134,59 @@ describe('HttpClient', () => {
             expect(relayerClient.getOrderbookAsync(request)).to.be.rejected();
         });
     });
-    describe('#getFeesAsync', () => {
+    describe('#getOrderConfigAsync', () => {
         const request = {
-            exchangeContractAddress: '0x12459c951127e0c374ff9105dda097662a027093',
+            makerAddress: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
-            maker: '0x9e56625509c2f60af937f23b7b532600390e8c8b',
+            takerAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
-            taker: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32',
+            makerAssetAmount: '10000000000000000',
-            makerTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+            takerAssetAmount: '20000000000000000',
-            takerTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
+            expirationTimeSeconds: '1532560590',
-            makerTokenAmount: new BigNumber('10000000000000000000'),
+            makerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
-            takerTokenAmount: new BigNumber('30000000000000000000'),
+            takerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
-            salt: new BigNumber('256'),
+            exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093',
-            expirationUnixTimestampSec: new BigNumber('42'),
         };
-        const url = `${relayUrl}/fees`;
+        const url = `${relayUrl}/order_config`;
-        it('gets fees', async () => {
+        it('gets order config', async () => {
-            fetchMock.post(url, feesResponseJSON);
+            fetchMock.post(url, orderConfigResponseJSON);
-            const fees = await relayerClient.getFeesAsync(request);
+            const fees = await relayerClient.getOrderConfigAsync(request);
-            expect(fees).to.be.deep.equal(feesResponse);
+            expect(fees).to.be.deep.equal(orderConfigResponse);
         });
         it('does not mutate input', async () => {
-            fetchMock.post(url, feesResponseJSON);
+            fetchMock.post(url, orderConfigResponseJSON);
-            const makerTokenAmountBefore = new BigNumber(request.makerTokenAmount);
+            const makerAssetAmountBefore = request.makerAssetAmount;
-            const takerTokenAmountBefore = new BigNumber(request.takerTokenAmount);
+            const takerAssetAmountBefore = request.takerAssetAmount;
-            const saltBefore = new BigNumber(request.salt);
+            const expirationTimeSecondsBefore = request.expirationTimeSeconds;
-            const expirationUnixTimestampSecBefore = new BigNumber(request.expirationUnixTimestampSec);
+            await relayerClient.getOrderConfigAsync(request);
-            await relayerClient.getFeesAsync(request);
+            expect(makerAssetAmountBefore).to.be.deep.equal(request.makerAssetAmount);
-            expect(makerTokenAmountBefore).to.be.deep.equal(request.makerTokenAmount);
+            expect(takerAssetAmountBefore).to.be.deep.equal(request.takerAssetAmount);
-            expect(takerTokenAmountBefore).to.be.deep.equal(request.takerTokenAmount);
+            expect(expirationTimeSecondsBefore).to.be.deep.equal(request.expirationTimeSeconds);
-            expect(saltBefore).to.be.deep.equal(request.salt);
-            expect(expirationUnixTimestampSecBefore).to.be.deep.equal(request.expirationUnixTimestampSec);
         });
         it('throws an error for invalid JSON response', async () => {
             fetchMock.post(url, { test: 'dummy' });
-            expect(relayerClient.getFeesAsync(request)).to.be.rejected();
+            expect(relayerClient.getOrderConfigAsync(request)).to.be.rejected();
+        });
+    });
+    describe('#getFeeRecipientsAsync', () => {
+        const url = `${relayUrl}/fee_recipients`;
+        it('gets fee recipients with default page options when none are provided', async () => {
+            fetchMock.get(url, feeRecipientsResponseJSON);
+            const feeRecipients = await relayerClient.getFeeRecipientsAsync();
+            expect(feeRecipients).to.be.deep.equal(feeRecipientsResponse);
+        });
+        it('gets fee recipient with specified page options', async () => {
+            const urlWithQuery = `${url}?networkId=42&page=3&perPage=50`;
+            fetchMock.get(urlWithQuery, feeRecipientsResponseJSON);
+            const pagedRequestOptions = {
+                page: 3,
+                perPage: 50,
+                networkId: 42,
+            };
+            const feeRecipients = await relayerClient.getFeeRecipientsAsync(pagedRequestOptions);
+            expect(feeRecipients).to.be.deep.equal(feeRecipientsResponse);
+        });
+        it('throws an error for invalid JSON response', async () => {
+            fetchMock.get(url, { test: 'dummy' });
+            expect(relayerClient.getFeeRecipientsAsync()).to.be.rejected();
         });
     });
 });

packages/connect/test/orderbook_channel_factory_test.ts

@@ -1,45 +0,0 @@
-import * as chai from 'chai';
-import * as dirtyChai from 'dirty-chai';
-import * as _ from 'lodash';
-import 'mocha';
-
-import { orderbookChannelFactory } from '../src/orderbook_channel_factory';
-
-chai.config.includeStack = true;
-chai.use(dirtyChai);
-const expect = chai.expect;
-const emptyOrderbookChannelHandler = {
-    onSnapshot: () => {
-        _.noop();
-    },
-    onUpdate: () => {
-        _.noop();
-    },
-    onError: () => {
-        _.noop();
-    },
-    onClose: () => {
-        _.noop();
-    },
-};
-
-describe('orderbookChannelFactory', () => {
-    const websocketUrl = 'ws://localhost:8080';
-    describe('#createWebSocketOrderbookChannelAsync', () => {
-        it('throws when input is not a url', () => {
-            const badUrlInput = 54;
-            expect(
-                orderbookChannelFactory.createWebSocketOrderbookChannelAsync(
-                    badUrlInput as any,
-                    emptyOrderbookChannelHandler,
-                ),
-            ).to.be.rejected();
-        });
-        it('throws when handler has the incorrect members', () => {
-            const badHandlerInput = {};
-            expect(
-                orderbookChannelFactory.createWebSocketOrderbookChannelAsync(websocketUrl, badHandlerInput as any),
-            ).to.be.rejected();
-        });
-    });
-});

packages/connect/test/orderbook_channel_message_parsers_test.ts

@@ -1,76 +0,0 @@
-import * as chai from 'chai';
-import * as dirtyChai from 'dirty-chai';
-import 'mocha';
-
-import { orderbookChannelMessageParser } from '../src/utils/orderbook_channel_message_parser';
-
-import { orderResponse } from './fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f';
-import { orderbookResponse } from './fixtures/standard_relayer_api/orderbook';
-import {
-    malformedSnapshotOrderbookChannelMessage,
-    snapshotOrderbookChannelMessage,
-} from './fixtures/standard_relayer_api/snapshot_orderbook_channel_message';
-import { unknownOrderbookChannelMessage } from './fixtures/standard_relayer_api/unknown_orderbook_channel_message';
-import {
-    malformedUpdateOrderbookChannelMessage,
-    updateOrderbookChannelMessage,
-} from './fixtures/standard_relayer_api/update_orderbook_channel_message';
-
-chai.config.includeStack = true;
-chai.use(dirtyChai);
-const expect = chai.expect;
-
-describe('orderbookChannelMessageParser', () => {
-    describe('#parser', () => {
-        it('parses snapshot messages', () => {
-            const snapshotMessage = orderbookChannelMessageParser.parse(snapshotOrderbookChannelMessage);
-            expect(snapshotMessage.type).to.be.equal('snapshot');
-            expect(snapshotMessage.payload).to.be.deep.equal(orderbookResponse);
-        });
-        it('parses update messages', () => {
-            const updateMessage = orderbookChannelMessageParser.parse(updateOrderbookChannelMessage);
-            expect(updateMessage.type).to.be.equal('update');
-            expect(updateMessage.payload).to.be.deep.equal(orderResponse);
-        });
-        it('returns unknown message for messages with unsupported types', () => {
-            const unknownMessage = orderbookChannelMessageParser.parse(unknownOrderbookChannelMessage);
-            expect(unknownMessage.type).to.be.equal('unknown');
-            expect(unknownMessage.payload).to.be.undefined();
-        });
-        it('throws when message does not include a type', () => {
-            const typelessMessage = `{
-                "channel": "orderbook",
-                "requestId": 1,
-                "payload": {}
-            }`;
-            const badCall = () => orderbookChannelMessageParser.parse(typelessMessage);
-            expect(badCall).throws(`Message is missing a type parameter: ${typelessMessage}`);
-        });
-        it('throws when type is not a string', () => {
-            const messageWithBadType = `{
-                "type": 1,
-                "channel": "orderbook",
-                "requestId": 1,
-                "payload": {}
-            }`;
-            const badCall = () => orderbookChannelMessageParser.parse(messageWithBadType);
-            expect(badCall).throws('Expected type to be of type string, encountered: 1');
-        });
-        it('throws when snapshot message has malformed payload', () => {
-            const badCall = () => orderbookChannelMessageParser.parse(malformedSnapshotOrderbookChannelMessage);
-            // tslint:disable-next-line:max-line-length
-            const errMsg =
-                'Validation errors: instance.payload requires property "bids", instance.payload requires property "asks"';
-            expect(badCall).throws(errMsg);
-        });
-        it('throws when update message has malformed payload', () => {
-            const badCall = () => orderbookChannelMessageParser.parse(malformedUpdateOrderbookChannelMessage);
-            expect(badCall).throws(/^Expected message to conform to schema/);
-        });
-        it('throws when input message is not valid JSON', () => {
-            const nonJsonString = 'h93b{sdfs9fsd f';
-            const badCall = () => orderbookChannelMessageParser.parse(nonJsonString);
-            expect(badCall).throws('Unexpected token h in JSON at position 0');
-        });
-    });
-});

packages/connect/test/orders_channel_factory_test.ts

@@ -0,0 +1,34 @@
+import * as chai from 'chai';
+import * as dirtyChai from 'dirty-chai';
+import * as _ from 'lodash';
+
+import 'mocha';
+
+import { ordersChannelFactory } from '../src/orders_channel_factory';
+
+chai.config.includeStack = true;
+chai.use(dirtyChai);
+const expect = chai.expect;
+const emptyOrdersChannelHandler = {
+    onUpdate: _.noop.bind(_),
+    onError: _.noop.bind(_),
+    onClose: _.noop.bind(_),
+};
+
+describe('ordersChannelFactory', () => {
+    const websocketUrl = 'ws://localhost:8080';
+    describe('#createWebSocketOrdersChannelAsync', () => {
+        it('throws when input is not a url', () => {
+            const badUrlInput = 54;
+            expect(
+                ordersChannelFactory.createWebSocketOrdersChannelAsync(badUrlInput as any, emptyOrdersChannelHandler),
+            ).to.be.rejected();
+        });
+        it('throws when handler has the incorrect members', () => {
+            const badHandlerInput = {};
+            expect(
+                ordersChannelFactory.createWebSocketOrdersChannelAsync(websocketUrl, badHandlerInput as any),
+            ).to.be.rejected();
+        });
+    });
+});

packages/connect/test/orders_channel_message_parsers_test.ts

@@ -0,0 +1,59 @@
+import * as chai from 'chai';
+import * as dirtyChai from 'dirty-chai';
+import 'mocha';
+
+import { ordersChannelMessageParser } from '../src/utils/orders_channel_message_parser';
+
+import { orderResponse } from './fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f';
+import { unknownOrdersChannelMessage } from './fixtures/standard_relayer_api/unknown_orders_channel_message';
+import {
+    malformedUpdateOrdersChannelMessage,
+    updateOrdersChannelMessage,
+} from './fixtures/standard_relayer_api/update_orders_channel_message';
+
+chai.config.includeStack = true;
+chai.use(dirtyChai);
+const expect = chai.expect;
+
+describe('ordersChannelMessageParser', () => {
+    describe('#parser', () => {
+        it('parses update messages', () => {
+            const updateMessage = ordersChannelMessageParser.parse(updateOrdersChannelMessage);
+            expect(updateMessage.type).to.be.equal('update');
+            expect(updateMessage.payload).to.be.deep.equal([orderResponse]);
+        });
+        it('returns unknown message for messages with unsupported types', () => {
+            const unknownMessage = ordersChannelMessageParser.parse(unknownOrdersChannelMessage);
+            expect(unknownMessage.type).to.be.equal('unknown');
+            expect(unknownMessage.payload).to.be.undefined();
+        });
+        it('throws when message does not include a type', () => {
+            const typelessMessage = `{
+                "channel": "orders",
+                "requestId": "4d8efcee-adde-4475-9601-f0b30962ca2b",
+                "payload": []
+            }`;
+            const badCall = () => ordersChannelMessageParser.parse(typelessMessage);
+            expect(badCall).throws(`Message is missing a type parameter: ${typelessMessage}`);
+        });
+        it('throws when type is not a string', () => {
+            const messageWithBadType = `{
+                "type": 1,
+                "channel": "orders",
+                "requestId": "4d8efcee-adde-4475-9601-f0b30962ca2b",
+                "payload": []
+            }`;
+            const badCall = () => ordersChannelMessageParser.parse(messageWithBadType);
+            expect(badCall).throws('Expected type to be of type string, encountered: 1');
+        });
+        it('throws when update message has malformed payload', () => {
+            const badCall = () => ordersChannelMessageParser.parse(malformedUpdateOrdersChannelMessage);
+            expect(badCall).throws(/^Expected message to conform to schema/);
+        });
+        it('throws when input message is not valid JSON', () => {
+            const nonJsonString = 'h93b{sdfs9fsd f';
+            const badCall = () => ordersChannelMessageParser.parse(nonJsonString);
+            expect(badCall).throws('Unexpected token h in JSON at position 0');
+        });
+    });
+});

packages/connect/test/ws_orderbook_channel_test.ts

@@ -1,59 +0,0 @@
-import * as chai from 'chai';
-import * as dirtyChai from 'dirty-chai';
-import * as _ from 'lodash';
-import 'mocha';
-import * as Sinon from 'sinon';
-import * as WebSocket from 'websocket';
-
-import { WebSocketOrderbookChannel } from '../src/ws_orderbook_channel';
-
-chai.config.includeStack = true;
-chai.use(dirtyChai);
-const expect = chai.expect;
-const emptyOrderbookChannelHandler = {
-    onSnapshot: () => {
-        _.noop();
-    },
-    onUpdate: () => {
-        _.noop();
-    },
-    onError: () => {
-        _.noop();
-    },
-    onClose: () => {
-        _.noop();
-    },
-};
-
-describe('WebSocketOrderbookChannel', () => {
-    const websocketUrl = 'ws://localhost:8080';
-    const openClient = new WebSocket.w3cwebsocket(websocketUrl);
-    Sinon.stub(openClient, 'readyState').get(() => WebSocket.w3cwebsocket.OPEN);
-    Sinon.stub(openClient, 'send').callsFake(_.noop.bind(_));
-    const openOrderbookChannel = new WebSocketOrderbookChannel(openClient, emptyOrderbookChannelHandler);
-    const subscriptionOpts = {
-        baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
-        quoteTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
-        snapshot: true,
-        limit: 100,
-    };
-    describe('#subscribe', () => {
-        it('throws when subscriptionOpts does not conform to schema', () => {
-            const badSubscribeCall = openOrderbookChannel.subscribe.bind(openOrderbookChannel, {});
-            expect(badSubscribeCall).throws(
-                'Expected subscriptionOpts to conform to schema /RelayerApiOrderbookChannelSubscribePayload\nEncountered: {}\nValidation errors: instance requires property "baseTokenAddress", instance requires property "quoteTokenAddress"',
-            );
-        });
-        it('does not throw when inputs are of correct types', () => {
-            const goodSubscribeCall = openOrderbookChannel.subscribe.bind(openOrderbookChannel, subscriptionOpts);
-            expect(goodSubscribeCall).to.not.throw();
-        });
-        it('throws when client is closed', () => {
-            const closedClient = new WebSocket.w3cwebsocket(websocketUrl);
-            Sinon.stub(closedClient, 'readyState').get(() => WebSocket.w3cwebsocket.CLOSED);
-            const closedOrderbookChannel = new WebSocketOrderbookChannel(closedClient, emptyOrderbookChannelHandler);
-            const badSubscribeCall = closedOrderbookChannel.subscribe.bind(closedOrderbookChannel, subscriptionOpts);
-            expect(badSubscribeCall).throws('WebSocket connection is closed');
-        });
-    });
-});

packages/connect/test/ws_orders_channel_test.ts

@@ -0,0 +1,49 @@
+import * as chai from 'chai';
+import * as dirtyChai from 'dirty-chai';
+import * as _ from 'lodash';
+import 'mocha';
+import * as Sinon from 'sinon';
+import * as WebSocket from 'websocket';
+
+import { WebSocketOrdersChannel } from '../src/ws_orders_channel';
+
+chai.config.includeStack = true;
+chai.use(dirtyChai);
+const expect = chai.expect;
+const emptyOrdersChannelHandler = {
+    onUpdate: _.noop.bind(_),
+    onError: _.noop.bind(_),
+    onClose: _.noop.bind(_),
+};
+
+describe('WebSocketOrdersChannel', () => {
+    const websocketUrl = 'ws://localhost:8080';
+    const openClient = new WebSocket.w3cwebsocket(websocketUrl);
+    Sinon.stub(openClient, 'readyState').get(() => WebSocket.w3cwebsocket.OPEN);
+    Sinon.stub(openClient, 'send').callsFake(_.noop.bind(_));
+    const openOrdersChannel = new WebSocketOrdersChannel(openClient, emptyOrdersChannelHandler);
+    const subscriptionOpts = {
+        baseAssetData: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+        quoteAssetData: '0xef7fff64389b814a946f3e92105513705ca6b990',
+        limit: 100,
+    };
+    describe('#subscribe', () => {
+        it('throws when subscriptionOpts does not conform to schema', () => {
+            const badSubscribeCall = openOrdersChannel.subscribe.bind(openOrdersChannel, {
+                makerAssetData: 5,
+            });
+            expect(badSubscribeCall).throws();
+        });
+        it('does not throw when inputs are of correct types', () => {
+            const goodSubscribeCall = openOrdersChannel.subscribe.bind(openOrdersChannel, subscriptionOpts);
+            expect(goodSubscribeCall).to.not.throw();
+        });
+        it('throws when client is closed', () => {
+            const closedClient = new WebSocket.w3cwebsocket(websocketUrl);
+            Sinon.stub(closedClient, 'readyState').get(() => WebSocket.w3cwebsocket.CLOSED);
+            const closedOrdersChannel = new WebSocketOrdersChannel(closedClient, emptyOrdersChannelHandler);
+            const badSubscribeCall = closedOrdersChannel.subscribe.bind(closedOrdersChannel, subscriptionOpts);
+            expect(badSubscribeCall).throws('WebSocket connection is closed');
+        });
+    });
+});

packages/contract-wrappers/CHANGELOG.json

@@ -1,4 +1,33 @@
 [
+    {
+        "version": "1.0.1-rc.5",
+        "changes": [
+            {
+                "note": "Fix missing `BlockParamLiteral` type import issue"
+            }
+        ],
+        "timestamp": 1535377027
+    },
+    {
+        "version": "1.0.1-rc.4",
+        "changes": [
+            {
+                "note":
+                    "Export missing types: `TransactionEncoder`, `ContractAbi`, `JSONRPCRequestPayload`, `JSONRPCResponsePayload`, `JSONRPCErrorCallback`, `AbiDefinition`, `FunctionAbi`, `EventAbi`, `EventParameter`, `DecodedLogArgs`, `MethodAbi`, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability`, `StateMutability` & `ExchangeSignatureValidatorApprovalEventArgs`",
+                "pr": 924
+            },
+            {
+                "note":
+                    "Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`,     `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs`",
+                "pr": 924
+            },
+            {
+                "note": "Added Transaction Encoder for use with 0x Exchange executeTransaction",
+                "pr": 975
+            }
+        ],
+        "timestamp": 1535133899
+    },
     {
         "version": "1.0.1-rc.3",
         "changes": [

packages/contract-wrappers/CHANGELOG.md

@@ -5,7 +5,17 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.1-rc.3 - _August 13, 2018_
+## v1.0.1-rc.5 - _August 27, 2018_
+
+    * Fix missing `BlockParamLiteral` type import issue
+
+## v1.0.1-rc.4 - _August 24, 2018_
+
+    * Export missing types: `TransactionEncoder`, `ContractAbi`, `JSONRPCRequestPayload`, `JSONRPCResponsePayload`, `JSONRPCErrorCallback`, `AbiDefinition`, `FunctionAbi`, `EventAbi`, `EventParameter`, `DecodedLogArgs`, `MethodAbi`, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability`, `StateMutability` & `ExchangeSignatureValidatorApprovalEventArgs` (#924)
+    * Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`,     `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs` (#924)
+    * Added Transaction Encoder for use with 0x Exchange executeTransaction (#975)
+
+## v1.0.1-rc.3 - _August 14, 2018_
 
     * Added strict encoding/decoding checks for sendTransaction and call (#915)
     * Add ForwarderWrapper (#934)
@@ -23,7 +33,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0-rc.1 - _July 19, 2018_
+## v1.0.0-rc.1 - _July 20, 2018_
 
     * Update blockstream to v5.0 and propogate up caught errors to active subscriptions (#815)
     * Update to v2 of 0x rpotocol (#822)

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/contract-wrappers",
-    "version": "1.0.1-rc.2",
+    "version": "1.0.1-rc.5",
     "description": "Smart TS wrappers for 0x smart contracts",
     "keywords": [
         "0xproject",
@@ -12,7 +12,7 @@
     "types": "lib/src/index.d.ts",
     "scripts": {
         "watch_without_deps": "yarn pre_build && tsc -w",
-        "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build": "yarn pre_build && tsc",
         "pre_build": "run-s update_artifacts_v2_beta update_artifacts_v2 generate_contract_wrappers copy_artifacts",
         "generate_contract_wrappers": "abi-gen --abis 'src/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token|ZRXToken|ERC20Token|ERC721Token|WETH9|ERC20Proxy|ERC721Proxy|Forwarder).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers",
         "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*",
@@ -24,13 +24,16 @@
         "update_artifacts_v2_beta": "for i in ${npm_package_config_contracts_v2_beta}; do copyfiles -u 4 ../migrations/artifacts/2.0.0-beta-testnet/$i.json src/artifacts; done;",
         "update_artifacts_v2": "for i in ${npm_package_config_contracts_v2}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json src/artifacts; done;",
         "copy_artifacts": "copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts",
-        "clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/contract_wrappers/generated src/artifacts",
+        "clean": "shx rm -rf _bundles lib test_temp test/artifacts src/contract_wrappers/generated src/artifacts generated_docs",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
+        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "config": {
-        "contracts_v2_beta": "Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken Forwarder",
+        "contracts_v2_beta": "AssetProxyOwner Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken Forwarder OrderValidator",
-        "contracts_v2": "DummyERC20Token DummyERC721Token"
+        "contracts_v2": "DummyERC20Token DummyERC721Token",
+        "postpublish": {
+            "assets": []
+        }
     },
     "repository": {
         "type": "git",
@@ -41,13 +44,11 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.4",
+        "@0xproject/abi-gen": "^1.0.7",
-        "@0xproject/dev-utils": "^1.0.3",
+        "@0xproject/dev-utils": "^1.0.6",
-        "@0xproject/migrations": "^1.0.3",
+        "@0xproject/migrations": "^1.0.6",
-        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/subproviders": "^2.0.1",
-        "@0xproject/sol-compiler": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.6",
-        "@0xproject/subproviders": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -57,7 +58,7 @@
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
@@ -68,20 +69,21 @@
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
         "tslint": "5.11.0",
-        "typescript": "2.9.2",
+        "typedoc": "0.12.0",
+        "typescript": "3.0.1",
         "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.4",
+        "@0xproject/assert": "^1.0.7",
-        "@0xproject/base-contract": "^1.0.4",
+        "@0xproject/base-contract": "^2.0.1",
-        "@0xproject/fill-scenarios": "^1.0.1-rc.2",
+        "@0xproject/fill-scenarios": "^1.0.1-rc.5",
-        "@0xproject/json-schemas": "^1.0.1-rc.3",
+        "@0xproject/json-schemas": "^1.0.1-rc.6",
-        "@0xproject/order-utils": "^1.0.1-rc.2",
+        "@0xproject/order-utils": "^1.0.1-rc.6",
-        "@0xproject/types": "^1.0.1-rc.3",
+        "@0xproject/types": "^1.0.1-rc.6",
-        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/utils": "^1.0.7",
-        "@0xproject/web3-wrapper": "^1.1.2",
+        "@0xproject/web3-wrapper": "^2.0.1",
-        "ethereum-types": "^1.0.3",
+        "ethereum-types": "^1.0.5",
         "ethereumjs-blockstream": "5.0.0",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",

packages/contract-wrappers/src/artifacts.ts

@@ -1,4 +1,4 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
+import { ContractArtifact } from 'ethereum-types';
 
 import * as DummyERC20Token from './artifacts/DummyERC20Token.json';
 import * as DummyERC721Token from './artifacts/DummyERC721Token.json';

packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts

@@ -1,7 +1,14 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
 import { AbiDecoder, intervalUtils, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { BlockParamLiteral, ContractAbi, FilterObject, LogEntry, LogWithDecodedArgs, RawLog } from 'ethereum-types';
+import {
+    BlockParamLiteral,
+    ContractAbi,
+    ContractArtifact,
+    FilterObject,
+    LogEntry,
+    LogWithDecodedArgs,
+    RawLog,
+} from 'ethereum-types';
 import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
 import * as _ from 'lodash';
 

packages/contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts

@@ -16,6 +16,13 @@ export class ERC20ProxyWrapper extends ContractWrapper {
     public abi: ContractAbi = artifacts.ERC20Proxy.compilerOutput.abi;
     private _erc20ProxyContractIfExists?: ERC20ProxyContract;
     private _contractAddressIfExists?: string;
+    /**
+     * Instantiate ERC20ProxyWrapper
+     * @param web3Wrapper Web3Wrapper instance to use
+     * @param networkId Desired networkId
+     * @param contractAddressIfExists The contract address to use. This is usually pulled from
+     * the artifacts but needs to be specified when using with your own custom testnet.
+     */
     constructor(web3Wrapper: Web3Wrapper, networkId: number, contractAddressIfExists?: string) {
         super(web3Wrapper, networkId);
         this._contractAddressIfExists = contractAddressIfExists;

packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts

@@ -34,6 +34,13 @@ export class ERC20TokenWrapper extends ContractWrapper {
     public UNLIMITED_ALLOWANCE_IN_BASE_UNITS = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
     private _tokenContractsByAddress: { [address: string]: ERC20TokenContract };
     private _erc20ProxyWrapper: ERC20ProxyWrapper;
+    /**
+     * Instantiate ERC20TokenWrapper
+     * @param web3Wrapper Web3Wrapper instance to use
+     * @param networkId Desired networkId
+     * @param erc20ProxyWrapper The ERC20ProxyWrapper instance to use
+     * @param blockPollingIntervalMs The block polling interval to use for active subscriptions
+     */
     constructor(
         web3Wrapper: Web3Wrapper,
         networkId: number,

packages/contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts

@@ -16,6 +16,13 @@ export class ERC721ProxyWrapper extends ContractWrapper {
     public abi: ContractAbi = artifacts.ERC20Proxy.compilerOutput.abi;
     private _erc721ProxyContractIfExists?: ERC721ProxyContract;
     private _contractAddressIfExists?: string;
+    /**
+     * Instantiate ERC721ProxyWrapper
+     * @param web3Wrapper Web3Wrapper instance to use
+     * @param networkId Desired networkId
+     * @param contractAddressIfExists The contract address to use. This is usually pulled from
+     * the artifacts but needs to be specified when using with your own custom testnet.
+     */
     constructor(web3Wrapper: Web3Wrapper, networkId: number, contractAddressIfExists?: string) {
         super(web3Wrapper, networkId);
         this._contractAddressIfExists = contractAddressIfExists;

packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts

@@ -33,6 +33,13 @@ export class ERC721TokenWrapper extends ContractWrapper {
     public abi: ContractAbi = artifacts.ERC721Token.compilerOutput.abi;
     private _tokenContractsByAddress: { [address: string]: ERC721TokenContract };
     private _erc721ProxyWrapper: ERC721ProxyWrapper;
+    /**
+     * Instantiate ERC721TokenWrapper
+     * @param web3Wrapper Web3Wrapper instance to use
+     * @param networkId Desired networkId
+     * @param erc721ProxyWrapper The ERC721ProxyWrapper instance to use
+     * @param blockPollingIntervalMs The block polling interval to use for active subscriptions
+     */
     constructor(
         web3Wrapper: Web3Wrapper,
         networkId: number,

packages/contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts

@@ -24,6 +24,13 @@ export class EtherTokenWrapper extends ContractWrapper {
         [address: string]: WETH9Contract;
     } = {};
     private _erc20TokenWrapper: ERC20TokenWrapper;
+    /**
+     * Instantiate EtherTokenWrapper.
+     * @param web3Wrapper Web3Wrapper instance to use
+     * @param networkId Desired networkId
+     * @param erc20TokenWrapper The ERC20TokenWrapper instance to use
+     * @param blockPollingIntervalMs The block polling interval to use for active subscriptions
+     */
     constructor(
         web3Wrapper: Web3Wrapper,
         networkId: number,

packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts

@@ -21,6 +21,7 @@ import {
 } from '../types';
 import { assert } from '../utils/assert';
 import { decorators } from '../utils/decorators';
+import { TransactionEncoder } from '../utils/transaction_encoder';
 
 import { ContractWrapper } from './contract_wrapper';
 import { ExchangeContract, ExchangeEventArgs, ExchangeEvents } from './generated/exchange';
@@ -34,6 +35,16 @@ export class ExchangeWrapper extends ContractWrapper {
     private _exchangeContractIfExists?: ExchangeContract;
     private _contractAddressIfExists?: string;
     private _zrxContractAddressIfExists?: string;
+    /**
+     * Instantiate ExchangeWrapper
+     * @param web3Wrapper Web3Wrapper instance to use
+     * @param networkId Desired networkId
+     * @param contractAddressIfExists The exchange contract address to use. This is usually pulled from
+     * the artifacts but needs to be specified when using with your own custom testnet.
+     * @param zrxContractAddressIfExists The ZRXToken contract address to use. This is usually pulled from
+     * the artifacts but needs to be specified when using with your own custom testnet.
+     * @param blockPollingIntervalMs The block polling interval to use for active subscriptions
+     */
     constructor(
         web3Wrapper: Web3Wrapper,
         networkId: number,
@@ -665,6 +676,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param leftSignedOrder  First order to match.
      * @param rightSignedOrder Second order to match.
      * @param takerAddress     The address that sends the transaction and gets the spread.
+     * @param orderTransactionOpts Optional arguments this method accepts.
      * @return Transaction hash.
      */
     @decorators.asyncZeroExErrorHandler
@@ -723,6 +735,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param signerAddress Address that should have signed the given hash.
      * @param signature     Proof that the hash has been signed by signer.
      * @param senderAddress Address that should send the transaction.
+     * @param orderTransactionOpts Optional arguments this method accepts.
      * @returns Transaction hash.
      */
     @decorators.asyncZeroExErrorHandler
@@ -901,7 +914,7 @@ export class ExchangeWrapper extends ContractWrapper {
     /**
      * Cancel a given order.
      * @param   order           An object that conforms to the Order or SignedOrder interface. The order you would like to cancel.
-     * @param   transactionOpts Optional arguments this method accepts.
+     * @param   orderTransactionOpts Optional arguments this method accepts.
      * @return  Transaction hash.
      */
     @decorators.asyncZeroExErrorHandler
@@ -1097,6 +1110,16 @@ export class ExchangeWrapper extends ContractWrapper {
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxTokenAddress);
         return zrxAssetData;
     }
+    /**
+     * Returns a Transaction Encoder. Transaction messages exist for the purpose of calling methods on the Exchange contract
+     * in the context of another address.
+     * @return TransactionEncoder
+     */
+    public async transactionEncoderAsync(): Promise<TransactionEncoder> {
+        const exchangeInstance = await this._getExchangeContractAsync();
+        const encoder = new TransactionEncoder(exchangeInstance);
+        return encoder;
+    }
     // tslint:disable:no-unused-variable
     private _invalidateContractInstances(): void {
         this.unsubscribeAll();