diff options
34 files changed, 196 insertions, 122 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 85b055571..d95940898 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,24 +6,117 @@ jobs: - image: circleci/node:6.12 environment: CONTRACTS_COMMIT_HASH: '9ed05f5' + working_directory: ~/repo steps: - checkout - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV + - restore_cache: + key: dependency-cache-{{ checksum "package.json" }} - run: name: yarn - command: yarn + command: yarn --frozen-lockfile - save_cache: key: dependency-cache-{{ checksum "package.json" }} paths: - - ~/.cache/yarn + - ./node_modules - run: wget https://s3.amazonaws.com/testrpc-shapshots/${CONTRACTS_COMMIT_HASH}.zip - run: unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot - run: node ./node_modules/lerna/bin/lerna.js bootstrap - run: yarn lerna:run build + - save_cache: + key: repo-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo + test-0xjs: + docker: + - image: circleci/node:6.12 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} - run: name: testrpc command: npm run testrpc -- --db testrpc_snapshot background: true - - run: yarn lerna:run test:circleci + - run: yarn lerna:run --scope 0x.js test:circleci + test-contracts: + docker: + - image: circleci/node:6.12 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: + name: testrpc + command: npm run testrpc -- --db testrpc_snapshot + background: true + - run: yarn lerna:run --scope contracts test:circleci:contracts + test-deployer: + docker: + - image: circleci/node:6.12 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: + name: testrpc + command: npm run testrpc -- --db testrpc_snapshot + background: true + - run: yarn lerna:run --scope contracts test:circleci:deployer + test-rest: + docker: + - image: circleci/node:6.12 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: + name: testrpc + command: npm run testrpc -- --db testrpc_snapshot + background: true + - run: yarn lerna:run --ignore contracts --ignore 0x.js --ignore subproviders test:circleci + lint: + working_directory: ~/repo + docker: + - image: circleci/node:6.12 + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} - run: yarn lerna:run lint + prettier: + working_directory: ~/repo + docker: + - image: circleci/node:6.12 + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} - run: yarn prettier:ci +workflows: + version: 2 + main: + jobs: + - build + - test-0xjs: + requires: + - build + - test-contracts: + requires: + - build + - test-deployer: + requires: + - build + - test-rest: + requires: + - build + - prettier: + requires: + - build + - lint: + requires: + - build diff --git a/package.json b/package.json index 597e61886..d0e6966cd 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@0xproject/utils": "^0.1.0", "async-child-process": "^1.1.1", - "ethereumjs-testrpc": "6.0.3", + "ethereumjs-testrpc": "^6.0.3", "lerna": "^2.5.1", "prettier": "1.9.2", "publish-release": "0xproject/publish-release", diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 0a3b45513..84997389a 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## v0.x.x - _TBD, 2018_ +## v0.30.0 - _January 17, 2018_ * Add an error parameter to the order watcher callback (#312) * Fix a bug making it impossible to catch some errors from awaitTransactionMinedAsync (#312) diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 1f11c43d6..1405e1bf7 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.29.2", + "version": "0.30.0", "description": "A javascript library for interacting with the 0x protocol", "keywords": ["0x.js", "0xproject", "ethereum", "tokens", "exchange"], "main": "lib/src/index.js", @@ -14,21 +14,16 @@ "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abiGlob 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --templates contract_templates --output src/contract_wrappers/generated", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", - "test:circleci": - "run-s test:coverage report_test_coverage && if [ $CIRCLE_BRANCH = \"development\" ]; then yarn test:umd; fi", + "test:circleci": "run-s test:coverage report_test_coverage", "test": "run-s clean test:commonjs", - "test:umd": "./scripts/test_umd.sh", "test:coverage": "nyc npm run test --all", "report_test_coverage": "nyc report --reporter=text-lcov | coveralls", "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;", "clean": "shx rm -rf _bundles lib test_temp", - "build:umd:dev": "webpack", "build:umd:prod": "NODE_ENV=production webpack", "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts;", "test:commonjs": "run-s build:commonjs run_mocha", - "pretest:umd": "run-s clean build:umd:dev build:commonjs", - "substitute_umd_bundle": "shx mv _bundles/* lib/src", "run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit" }, "config": { @@ -43,10 +38,10 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.1.1", - "@0xproject/dev-utils": "^0.0.4", - "@0xproject/tslint-config": "^0.4.1", - "@0xproject/types": "^0.1.3", + "@0xproject/abi-gen": "^0.1.2", + "@0xproject/dev-utils": "^0.0.5", + "@0xproject/tslint-config": "^0.4.2", + "@0xproject/types": "^0.1.4", "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.86", @@ -57,9 +52,9 @@ "awesome-typescript-loader": "^3.1.3", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.3", + "chai-as-promised-typescript-typings": "^0.0.4", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.1", + "chai-typescript-typings": "^0.0.2", "copyfiles": "^1.2.0", "coveralls": "^3.0.0", "dirty-chai": "^2.0.1", @@ -78,21 +73,19 @@ "typedoc": "~0.8.0", "typescript": "~2.6.1", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.9.3", + "web3-typescript-typings": "^0.9.4", "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.0.10", - "@0xproject/json-schemas": "^0.7.2", - "@0xproject/utils": "^0.1.3", - "@0xproject/web3-wrapper": "^0.1.4", + "@0xproject/assert": "^0.0.11", + "@0xproject/json-schemas": "^0.7.3", + "@0xproject/utils": "^0.2.0", + "@0xproject/web3-wrapper": "^0.1.5", "bintrees": "^1.0.2", "bn.js": "^4.11.8", - "compare-versions": "^3.0.1", "ethereumjs-abi": "^0.6.4", "ethereumjs-blockstream": "^2.0.6", "ethereumjs-util": "^5.1.1", - "find-versions": "^2.0.0", "js-sha3": "^0.6.1", "lodash": "^4.17.4", "uuid": "^3.1.0", diff --git a/packages/0x.js/scripts/test_umd.sh b/packages/0x.js/scripts/test_umd.sh deleted file mode 100755 index e3eba088a..000000000 --- a/packages/0x.js/scripts/test_umd.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -# This script runs umd tests and cleans up after them while preserving the `return_code` for CI -# UMD tests should only be run after building the commonjs because they reuse some of the commonjs build artifacts -run-s substitute_umd_bundle run_mocha -return_code=$? -exit $return_code diff --git a/packages/0x.js/src/globals.d.ts b/packages/0x.js/src/globals.d.ts index ff8e00b69..4f4932b6e 100644 --- a/packages/0x.js/src/globals.d.ts +++ b/packages/0x.js/src/globals.d.ts @@ -25,18 +25,6 @@ declare module '*.json' { /* tslint:enable */ } -// find-version declarations -declare function findVersions(version: string): string[]; -declare module 'find-versions' { - export = findVersions; -} - -// compare-version declarations -declare function compareVersions(firstVersion: string, secondVersion: string): number; -declare module 'compare-versions' { - export = compareVersions; -} - declare module 'ethereumjs-abi' { const soliditySHA3: (argTypes: string[], args: any[]) => Buffer; } diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts index 43a60957b..5d05bfb60 100644 --- a/packages/0x.js/src/order_watcher/event_watcher.ts +++ b/packages/0x.js/src/order_watcher/event_watcher.ts @@ -51,6 +51,10 @@ export class EventWatcher { } private async _pollForBlockchainEventsAsync(callback: EventWatcherCallback): Promise<void> { const pendingEvents = await this._getEventsAsync(); + if (_.isUndefined(pendingEvents)) { + // HACK: This should never happen, but happens frequently on CI due to a ganache bug + return; + } if (pendingEvents.length === 0) { // HACK: Sometimes when node rebuilds the pending block we get back the empty result. // We don't want to emit a lot of removal events and bring them back after a couple of miliseconds, diff --git a/packages/0x.js/test/utils/constants.ts b/packages/0x.js/test/utils/constants.ts index 7b6b2ee7b..a9e665c25 100644 --- a/packages/0x.js/test/utils/constants.ts +++ b/packages/0x.js/test/utils/constants.ts @@ -1,6 +1,6 @@ export const constants = { NULL_ADDRESS: '0x0000000000000000000000000000000000000000', - RPC_URL: 'http://localhost:8545/', + RPC_URL: 'http://localhost:8545', ROPSTEN_NETWORK_ID: 3, KOVAN_NETWORK_ID: 42, TESTRPC_NETWORK_ID: 50, diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 05f7a8778..87364c73e 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/abi-gen", - "version": "0.1.1", + "version": "0.1.2", "description": "Generate contract wrappers from ABI and handlebars templates", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/abi-gen/README.md", "dependencies": { - "@0xproject/utils": "^0.1.3", + "@0xproject/utils": "^0.2.0", "chalk": "^2.3.0", "glob": "^7.1.2", "handlebars": "^4.0.11", @@ -33,7 +33,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/glob": "^5.0.33", "@types/handlebars": "^4.0.36", "@types/mkdirp": "^0.5.1", @@ -43,6 +43,6 @@ "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3" + "web3-typescript-typings": "^0.9.4" } } diff --git a/packages/assert/package.json b/packages/assert/package.json index 2d5165e3d..5d1f9b4d2 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/assert", - "version": "0.0.10", + "version": "0.0.11", "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -23,12 +23,12 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", "chai": "^4.0.1", - "chai-typescript-typings": "^0.0.1", + "chai-typescript-typings": "^0.0.2", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", @@ -37,8 +37,8 @@ "typescript": "~2.6.1" }, "dependencies": { - "@0xproject/json-schemas": "^0.7.2", - "@0xproject/utils": "^0.1.3", + "@0xproject/json-schemas": "^0.7.3", + "@0xproject/utils": "^0.2.0", "lodash": "^4.17.4", "valid-url": "^1.0.9" } diff --git a/packages/chai-as-promised-typescript-typings/package.json b/packages/chai-as-promised-typescript-typings/package.json index 6ef4184b0..8c5314be5 100644 --- a/packages/chai-as-promised-typescript-typings/package.json +++ b/packages/chai-as-promised-typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "chai-as-promised-typescript-typings", - "version": "0.0.3", + "version": "0.0.4", "description": "Typescript type definitions for chai-as-promised", "main": "index.d.ts", "types": "index.d.ts", diff --git a/packages/chai-typescript-typings/package.json b/packages/chai-typescript-typings/package.json index 71040b554..db7cba863 100644 --- a/packages/chai-typescript-typings/package.json +++ b/packages/chai-typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "chai-typescript-typings", - "version": "0.0.1", + "version": "0.0.2", "description": "Typescript type definitions for chai", "main": "index.d.ts", "types": "index.d.ts", diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index d8e99b5d3..e02020204 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -1,12 +1,12 @@ # CHANGELOG -## v0.x.x - _TBD, 2017_ +## v0.5.0 - _January 17, 2018_ * Sanitize api endpoint url and remove trailing slashes (#318) * Improve error message text in HttpClient (#318) * Stop appending '/v0' to api endpoint url in HttpClient (#318) -## v0.4.0 - _January 11, 2017_ +## v0.4.0 - _January 11, 2018_ * Prevent getFeesAsync method on HttpClient from mutating input (#296) diff --git a/packages/connect/package.json b/packages/connect/package.json index 4ca9e65a2..45a01b475 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/connect", - "version": "0.4.1", + "version": "0.5.0", "description": "A javascript library for interacting with the standard relayer api", "keywords": ["connect", "0xproject", "ethereum", "tokens", "exchange"], "main": "lib/src/index.js", @@ -31,16 +31,16 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^0.0.10", - "@0xproject/json-schemas": "^0.7.2", - "@0xproject/utils": "^0.1.3", + "@0xproject/assert": "^0.0.11", + "@0xproject/json-schemas": "^0.7.3", + "@0xproject/utils": "^0.2.0", "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.4", "query-string": "^5.0.1", "websocket": "^1.0.25" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/fetch-mock": "^5.12.1", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", @@ -48,8 +48,8 @@ "@types/websocket": "^0.0.34", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.3", - "chai-typescript-typings": "^0.0.1", + "chai-as-promised-typescript-typings": "^0.0.4", + "chai-typescript-typings": "^0.0.2", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "fetch-mock": "^5.13.1", @@ -59,6 +59,6 @@ "tslint": "5.8.0", "typedoc": "~0.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3" + "web3-typescript-typings": "^0.9.4" } } diff --git a/packages/contracts/package.json b/packages/contracts/package.json index a3abac517..1cf716f92 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "contracts", - "version": "2.1.3", + "version": "2.1.4", "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { @@ -16,7 +16,8 @@ "migrate:truffle": "npm run build; truffle migrate", "migrate": "npm run build; node lib/deploy/cli.js migrate", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", - "test:circleci": "yarn test; yarn test:deployer", + "test:circleci:contracts": "yarn test", + "test:circleci:deployer": "yarn test:deployer", "test:deployer": "npm run build; mocha lib/deploy/test/*_test.js" }, "repository": { @@ -30,9 +31,9 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.0.4", - "@0xproject/tslint-config": "^0.4.1", - "@0xproject/types": "^0.1.3", + "@0xproject/dev-utils": "^0.0.5", + "@0xproject/tslint-config": "^0.4.2", + "@0xproject/types": "^0.1.4", "@types/bluebird": "^3.5.3", "@types/lodash": "^4.14.86", "@types/node": "^8.0.53", @@ -40,9 +41,9 @@ "@types/yargs": "^10.0.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.3", + "chai-as-promised-typescript-typings": "^0.0.4", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.1", + "chai-typescript-typings": "^0.0.2", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", @@ -52,14 +53,14 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3", + "web3-typescript-typings": "^0.9.4", "yargs": "^10.0.3" }, "dependencies": { - "0x.js": "^0.29.2", - "@0xproject/json-schemas": "^0.7.2", - "@0xproject/utils": "^0.1.3", - "@0xproject/web3-wrapper": "^0.1.4", + "0x.js": "^0.30.0", + "@0xproject/json-schemas": "^0.7.3", + "@0xproject/utils": "^0.2.0", + "@0xproject/web3-wrapper": "^0.1.5", "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 44a78c1b1..4a68dc2d4 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/dev-utils", - "version": "0.0.4", + "version": "0.0.5", "description": "0x dev TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/dev-utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -29,7 +29,7 @@ "typescript": "~2.6.1" }, "dependencies": { - "@0xproject/utils": "^0.1.3", + "@0xproject/utils": "^0.2.0", "ethereumjs-util": "^5.1.2", "lodash": "^4.17.4", "request-promise-native": "^1.0.5" diff --git a/packages/dev-utils/src/rpc.ts b/packages/dev-utils/src/rpc.ts index cf6678f81..36f8b1ef9 100644 --- a/packages/dev-utils/src/rpc.ts +++ b/packages/dev-utils/src/rpc.ts @@ -41,7 +41,7 @@ export class RPC { method, params, }); - this._url += 1; + this._id += 1; return payload; } private async _sendAsync(payload: string): Promise<any> { diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index ae2a54f5e..0f2fd156a 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/json-schemas", - "version": "0.7.2", + "version": "0.7.3", "description": "0x-related json schemas", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -27,13 +27,13 @@ "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", - "@0xproject/utils": "^0.1.3", + "@0xproject/tslint-config": "^0.4.2", + "@0xproject/utils": "^0.2.0", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", "chai": "^4.0.1", - "chai-typescript-typings": "^0.0.1", + "chai-typescript-typings": "^0.0.2", "dirty-chai": "^2.0.1", "lodash.foreach": "^4.5.0", "mocha": "^4.0.1", diff --git a/packages/kovan-faucets/package.json b/packages/kovan-faucets/package.json index bb5106496..eab0dc677 100644 --- a/packages/kovan-faucets/package.json +++ b/packages/kovan-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0xproject/kovan_faucets", - "version": "1.0.4", + "version": "1.0.5", "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { @@ -14,8 +14,8 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.29.2", - "@0xproject/utils": "^0.1.3", + "0x.js": "^0.30.0", + "@0xproject/utils": "^0.2.0", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.3", "express": "^4.15.2", @@ -25,7 +25,7 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "^4.14.86", @@ -36,7 +36,7 @@ "source-map-loader": "^0.1.6", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3", + "web3-typescript-typings": "^0.9.4", "webpack": "^3.1.0", "webpack-node-externals": "^1.6.0" } diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 77a3ad3ce..6a62e22dd 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/monorepo-scripts", - "version": "0.1.3", + "version": "0.1.4", "private": true, "description": "Helper scripts for the monorepo", "scripts": { @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/glob": "^5.0.33", "@types/node": "^8.0.53", "shx": "^0.2.2", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 9aff386b0..05464a11e 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/subproviders", - "version": "0.3.0", + "version": "0.3.1", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "license": "Apache-2.0", @@ -17,8 +17,8 @@ "test:integration": "run-s clean build run_mocha_integration" }, "dependencies": { - "@0xproject/assert": "^0.0.10", - "@0xproject/utils": "^0.1.3", + "@0xproject/assert": "^0.0.11", + "@0xproject/utils": "^0.2.0", "bn.js": "^4.11.8", "es6-promisify": "^5.0.0", "ethereumjs-tx": "^1.3.3", @@ -31,16 +31,16 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", - "@0xproject/utils": "^0.1.3", + "@0xproject/tslint-config": "^0.4.2", + "@0xproject/utils": "^0.2.0", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", "awesome-typescript-loader": "^3.1.3", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.3", - "chai-typescript-typings": "^0.0.1", + "chai-as-promised-typescript-typings": "^0.0.4", + "chai-typescript-typings": "^0.0.2", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index 06caadfd4..a53a8ab8a 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/tslint-config", - "version": "0.4.1", + "version": "0.4.2", "description": "Lint rules related to 0xProject for TSLint", "main": "tslint.json", "scripts": { diff --git a/packages/tslint-config/tslint.json b/packages/tslint-config/tslint.json index 486780de6..971588b08 100644 --- a/packages/tslint-config/tslint.json +++ b/packages/tslint-config/tslint.json @@ -60,6 +60,7 @@ "prefer-function-over-method": true, "promise-function-async": true, "quotemark": [true, "single", "avoid-escape", "jsx-double"], + "restrict-plus-operands": true, "semicolon": [true, "always"], "space-before-function-paren": [ true, diff --git a/packages/types/package.json b/packages/types/package.json index 4ef7f1b23..ef8c29c7c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "0.1.3", + "version": "0.1.4", "description": "0x types", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,13 +19,13 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/types/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1" }, "dependencies": { - "@0xproject/utils": "^0.1.3", + "@0xproject/utils": "^0.2.0", "web3": "^0.20.0" } } diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index e77a7fa03..efee30dd1 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## vx.x.x +## v0.2.0 - _January 17, 2018_ * Add `onError` parameter to `intervalUtils.setAsyncExcludingInterval` (#312) * Add `intervalUtils.setInterval` (#312) diff --git a/packages/utils/package.json b/packages/utils/package.json index 11a0dbcb0..7cc58c35b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/utils", - "version": "0.1.3", + "version": "0.2.0", "description": "0x TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", + "@0xproject/tslint-config": "^0.4.2", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json index c16e9ac31..5bf357566 100644 --- a/packages/web3-typescript-typings/package.json +++ b/packages/web3-typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "web3-typescript-typings", - "version": "0.9.3", + "version": "0.9.4", "description": "Typescript type definitions for web3", "main": "index.d.ts", "types": "index.d.ts", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 8c20f3f2e..f2802bfbf 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.4", + "version": "0.1.5", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,17 +19,17 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", - "@0xproject/types": "^0.1.3", + "@0xproject/tslint-config": "^0.4.2", + "@0xproject/types": "^0.1.4", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3" + "web3-typescript-typings": "^0.9.4" }, "dependencies": { - "@0xproject/utils": "^0.1.3", + "@0xproject/utils": "^0.2.0", "lodash": "^4.17.4", "web3": "^0.20.0" } diff --git a/packages/website/package.json b/packages/website/package.json index 83733f060..7d0f775d4 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.6", + "version": "0.0.7", "private": true, "description": "Website and 0x portal dapp", "scripts": { @@ -21,9 +21,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.29.2", - "@0xproject/subproviders": "^0.3.0", - "@0xproject/utils": "^0.1.3", + "0x.js": "^0.30.0", + "@0xproject/subproviders": "^0.3.1", + "@0xproject/utils": "^0.2.0", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", @@ -101,7 +101,7 @@ "style-loader": "0.13.x", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3", + "web3-typescript-typings": "^0.9.4", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", "webpack-dev-server": "^2.5.0" diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx index f2c505207..300e71f1f 100644 --- a/packages/website/ts/components/eth_weth_conversion_button.tsx +++ b/packages/website/ts/components/eth_weth_conversion_button.tsx @@ -105,7 +105,7 @@ export class EthWethConversionButton extends React.Component< } this.props.onConversionSuccessful(); } catch (err) { - const errMsg = '' + err; + const errMsg = `${err}`; if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) { this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true); } else if (!_.includes(errMsg, 'User denied transaction')) { diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx index 3144fc3bd..3ae0d48a7 100644 --- a/packages/website/ts/components/generate_order/generate_order_form.tsx +++ b/packages/website/ts/components/generate_order/generate_order_form.tsx @@ -329,7 +329,7 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G ${validationResult.errors}`); } } catch (err) { - const errMsg = '' + err; + const errMsg = `${err}`; if (utils.didUserDenyWeb3Request(errMsg)) { globalErrMsg = 'User denied sign request'; } else { diff --git a/packages/website/ts/components/inputs/allowance_toggle.tsx b/packages/website/ts/components/inputs/allowance_toggle.tsx index 1be441e17..da46db4f4 100644 --- a/packages/website/ts/components/inputs/allowance_toggle.tsx +++ b/packages/website/ts/components/inputs/allowance_toggle.tsx @@ -77,7 +77,7 @@ export class AllowanceToggle extends React.Component<AllowanceToggleProps, Allow this.setState({ isSpinnerVisible: false, }); - const errMsg = '' + err; + const errMsg = `${err}`; if (_.includes(errMsg, 'User denied transaction')) { return; } diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx index 01e69d4b2..2cef413c7 100644 --- a/packages/website/ts/components/token_balances.tsx +++ b/packages/website/ts/components/token_balances.tsx @@ -514,7 +514,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala this.props.dispatcher.showFlashMessage(`Successfully minted ${amount.toString(10)} ${token.symbol}`); return true; } catch (err) { - const errMsg = '' + err; + const errMsg = `${err}`; if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) { this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true); return false; @@ -3184,7 +3184,7 @@ ethereumjs-blockstream@^2.0.6: source-map-support "0.4.14" uuid "3.0.1" -ethereumjs-testrpc@6.0.3: +ethereumjs-testrpc@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-6.0.3.tgz#7a0b87bf3670f92f607f98fa6a78801d9741b124" dependencies: |