diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-01-25 09:13:16 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-01-25 09:13:16 +0800 |
commit | 3f0ec89f11fe405711c6b7509d6043339b8b4258 (patch) | |
tree | a6b5dea7d16d7ad2a02e2d0015c96c9e07ca2d84 /packages | |
parent | d3aa4f2bc7f2341a98c4aa6018c0d2ede221a3ed (diff) | |
parent | f58f0ddb67555c3f0c7252ea3e003824984c48ad (diff) | |
download | dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.gz dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.bz2 dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.lz dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.xz dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.zst dexon-0x-contracts-3f0ec89f11fe405711c6b7509d6043339b8b4258.zip |
Merge branch 'development' into feature/kovan-faucets/all-testnet-support
* development:
Publish
Update yarn.lock
Update the CHANGELOG
Fix the bug making it impossible to specify the custom ZRX address
Diffstat (limited to 'packages')
22 files changed, 128 insertions, 105 deletions
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 1a09eaf28..7fc1d9bba 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -3,6 +3,7 @@ ## v0.30.1 - _January 18, 2018_ * Fix a bug allowing negative fill values (#212) + * Fix a bug that made it impossible to pass a custom ZRX address (#341) ## v0.30.0 - _January 17, 2018_ diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 1405e1bf7..fb27f48de 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,25 +1,28 @@ { "name": "0x.js", - "version": "0.30.0", + "version": "0.30.1", "description": "A javascript library for interacting with the 0x protocol", - "keywords": ["0x.js", "0xproject", "ethereum", "tokens", "exchange"], + "keywords": [ + "0x.js", + "0xproject", + "ethereum", + "tokens", + "exchange" + ], "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "scripts": { "prebuild": "run-s clean generate_contract_wrappers", "build": "run-p build:umd:prod build:commonjs; exit 0;", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR", - "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", - "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", + "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", + "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", "test": "run-s clean test:commonjs", "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;", + "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:prod": "NODE_ENV=production webpack", "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts;", @@ -38,10 +41,10 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.1.2", - "@0xproject/dev-utils": "^0.0.5", - "@0xproject/tslint-config": "^0.4.2", - "@0xproject/types": "^0.1.4", + "@0xproject/abi-gen": "^0.1.3", + "@0xproject/dev-utils": "^0.0.6", + "@0xproject/tslint-config": "^0.4.3", + "@0xproject/types": "^0.1.5", "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.86", @@ -52,7 +55,7 @@ "awesome-typescript-loader": "^3.1.3", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.4", + "chai-as-promised-typescript-typings": "^0.0.5", "chai-bignumber": "^2.0.1", "chai-typescript-typings": "^0.0.2", "copyfiles": "^1.2.0", @@ -73,14 +76,14 @@ "typedoc": "~0.8.0", "typescript": "~2.6.1", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.9.4", + "web3-typescript-typings": "^0.9.5", "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.0.11", - "@0xproject/json-schemas": "^0.7.3", - "@0xproject/utils": "^0.2.0", - "@0xproject/web3-wrapper": "^0.1.5", + "@0xproject/assert": "^0.0.12", + "@0xproject/json-schemas": "^0.7.4", + "@0xproject/utils": "^0.2.1", + "@0xproject/web3-wrapper": "^0.1.6", "bintrees": "^1.0.2", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts index e1b0ef08e..503a937c4 100644 --- a/packages/0x.js/src/0x.ts +++ b/packages/0x.js/src/0x.ts @@ -191,6 +191,7 @@ export class ZeroEx { this._abiDecoder, this.token, config.exchangeContractAddress, + config.zrxContractAddress, ); this.tokenRegistry = new TokenRegistryWrapper( this._web3Wrapper, diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts index be88cdb20..2b6117729 100644 --- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts @@ -87,11 +87,13 @@ export class ExchangeWrapper extends ContractWrapper { abiDecoder: AbiDecoder, tokenWrapper: TokenWrapper, contractAddressIfExists?: string, + zrxContractAddressIfExists?: string, ) { super(web3Wrapper, networkId, abiDecoder); this._tokenWrapper = tokenWrapper; this._orderValidationUtils = new OrderValidationUtils(this); this._contractAddressIfExists = contractAddressIfExists; + this._zrxContractAddressIfExists = zrxContractAddressIfExists; } /** * Returns the unavailable takerAmount of an order. Unavailable amount is defined as the total diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts index 2decd92ba..3c93910e9 100644 --- a/packages/0x.js/src/types.ts +++ b/packages/0x.js/src/types.ts @@ -290,6 +290,7 @@ export interface OrderStateWatcherConfig { * networkId: The id of the underlying ethereum network your provider is connected to. (1-mainnet, 42-kovan, 50-testrpc) * gasPrice: Gas price to use with every transaction * exchangeContractAddress: The address of an exchange contract to use + * zrxContractAddress: The address of the ZRX contract to use * tokenRegistryContractAddress: The address of a token registry contract to use * tokenTransferProxyContractAddress: The address of the token transfer proxy contract to use * orderWatcherConfig: All the configs related to the orderWatcher @@ -298,6 +299,7 @@ export interface ZeroExConfig { networkId: number; gasPrice?: BigNumber; exchangeContractAddress?: string; + zrxContractAddress?: string; tokenRegistryContractAddress?: string; tokenTransferProxyContractAddress?: string; orderWatcherConfig?: OrderStateWatcherConfig; diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 87364c73e..8d2dee18a 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/abi-gen", - "version": "0.1.2", + "version": "0.1.3", "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.2.0", + "@0xproject/utils": "^0.2.1", "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.2", + "@0xproject/tslint-config": "^0.4.3", "@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.4" + "web3-typescript-typings": "^0.9.5" } } diff --git a/packages/assert/package.json b/packages/assert/package.json index 5d1f9b4d2..1c25b4e40 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/assert", - "version": "0.0.11", + "version": "0.0.12", "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,7 +23,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.2", + "@0xproject/tslint-config": "^0.4.3", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", @@ -37,8 +37,8 @@ "typescript": "~2.6.1" }, "dependencies": { - "@0xproject/json-schemas": "^0.7.3", - "@0xproject/utils": "^0.2.0", + "@0xproject/json-schemas": "^0.7.4", + "@0xproject/utils": "^0.2.1", "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 8c5314be5..34f4ed1f3 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.4", + "version": "0.0.5", "description": "Typescript type definitions for chai-as-promised", "main": "index.d.ts", "types": "index.d.ts", @@ -9,7 +9,9 @@ "url": "git+https://github.com/0xProject/0x.js.git" }, "author": "Fabio Berger", - "contributors": ["Leonid Logvinov <logvinov.leon@gmail.com>"], + "contributors": [ + "Leonid Logvinov <logvinov.leon@gmail.com>" + ], "license": "Apache-2.0", "bugs": { "url": "https://github.com/0xProject/0x.js/issues" diff --git a/packages/connect/package.json b/packages/connect/package.json index 45a01b475..a28916903 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,16 +1,21 @@ { "name": "@0xproject/connect", - "version": "0.5.0", + "version": "0.5.1", "description": "A javascript library for interacting with the standard relayer api", - "keywords": ["connect", "0xproject", "ethereum", "tokens", "exchange"], + "keywords": [ + "connect", + "0xproject", + "ethereum", + "tokens", + "exchange" + ], "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "scripts": { "build": "tsc", "clean": "shx rm -rf _bundles lib test_temp", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR", - "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", + "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", "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "run_mocha": "mocha lib/test/**/*_test.js", @@ -31,16 +36,16 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^0.0.11", - "@0xproject/json-schemas": "^0.7.3", - "@0xproject/utils": "^0.2.0", + "@0xproject/assert": "^0.0.12", + "@0xproject/json-schemas": "^0.7.4", + "@0xproject/utils": "^0.2.1", "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.4", "query-string": "^5.0.1", "websocket": "^1.0.25" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.2", + "@0xproject/tslint-config": "^0.4.3", "@types/fetch-mock": "^5.12.1", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", @@ -48,7 +53,7 @@ "@types/websocket": "^0.0.34", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.4", + "chai-as-promised-typescript-typings": "^0.0.5", "chai-typescript-typings": "^0.0.2", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", @@ -59,6 +64,6 @@ "tslint": "5.8.0", "typedoc": "~0.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.4" + "web3-typescript-typings": "^0.9.5" } } diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 3049c1666..5a76bbf7f 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,18 +1,16 @@ { "private": true, "name": "contracts", - "version": "2.1.4", + "version": "2.1.5", "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { "test": "test" }, "scripts": { - "build": - "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", + "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", "test": "npm run build; truffle test", - "compile:comment": - "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", + "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", "compile": "node ../deployer/lib/src/cli.js compile", "clean": "rm -rf ./lib", "migrate": "node ../deployer/lib/src/cli.js migrate", @@ -30,9 +28,9 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.0.5", - "@0xproject/tslint-config": "^0.4.2", - "@0xproject/types": "^0.1.4", + "@0xproject/dev-utils": "^0.0.6", + "@0xproject/tslint-config": "^0.4.3", + "@0xproject/types": "^0.1.5", "@types/bluebird": "^3.5.3", "@types/lodash": "^4.14.86", "@types/node": "^8.0.53", @@ -40,7 +38,7 @@ "@types/yargs": "^10.0.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.4", + "chai-as-promised-typescript-typings": "^0.0.5", "chai-bignumber": "^2.0.1", "chai-typescript-typings": "^0.0.2", "copyfiles": "^1.2.0", @@ -52,15 +50,15 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.4", + "web3-typescript-typings": "^0.9.5", "yargs": "^10.0.3" }, "dependencies": { - "0x.js": "^0.30.0", - "@0xproject/deployer": "*", - "@0xproject/json-schemas": "^0.7.3", - "@0xproject/utils": "^0.2.0", - "@0xproject/web3-wrapper": "^0.1.5", + "0x.js": "^0.30.1", + "@0xproject/deployer": "^0.0.2", + "@0xproject/json-schemas": "^0.7.4", + "@0xproject/utils": "^0.2.1", + "@0xproject/web3-wrapper": "^0.1.6", "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/deployer/package.json b/packages/deployer/package.json index b359382c5..1ae0ca227 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/deployer", - "version": "0.0.1", + "version": "0.0.2", "description": "Smart contract deployer of 0x protocol", "main": "lib/src/cli.js", "scripts": { @@ -27,17 +27,17 @@ "homepage": "https://github.com/0xProject/0x.js/packages/deployer/README.md", "devDependencies": { "copyfiles": "^1.2.0", - "web3-typescript-typings": "^0.9.3", "types-bn": "^0.0.1", - "typescript": "~2.6.1" + "typescript": "~2.6.1", + "web3-typescript-typings": "^0.9.5" }, "dependencies": { "@0xproject/utils": "^0.1.3", - "@0xproject/web3-wrapper": "^0.1.4", + "@0xproject/web3-wrapper": "^0.1.6", "lodash": "^4.17.4", "solc": "^0.4.18", - "yargs": "^10.0.3", + "web3": "^0.20.0", "web3-eth-abi": "^1.0.0-beta.24", - "web3": "^0.20.0" + "yargs": "^10.0.3" } } diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 4a68dc2d4..1cd54f15f 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/dev-utils", - "version": "0.0.5", + "version": "0.0.6", "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.2", + "@0xproject/tslint-config": "^0.4.3", "@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.2.0", + "@0xproject/utils": "^0.2.1", "ethereumjs-util": "^5.1.2", "lodash": "^4.17.4", "request-promise-native": "^1.0.5" diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 0f2fd156a..4b500eab3 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/json-schemas", - "version": "0.7.3", + "version": "0.7.4", "description": "0x-related json schemas", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -27,8 +27,8 @@ "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.2", - "@0xproject/utils": "^0.2.0", + "@0xproject/tslint-config": "^0.4.3", + "@0xproject/utils": "^0.2.1", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 6a62e22dd..57d0d6f5f 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/monorepo-scripts", - "version": "0.1.4", + "version": "0.1.5", "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.2", + "@0xproject/tslint-config": "^0.4.3", "@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 05464a11e..2735f8280 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/subproviders", - "version": "0.3.1", + "version": "0.3.2", "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.11", - "@0xproject/utils": "^0.2.0", + "@0xproject/assert": "^0.0.12", + "@0xproject/utils": "^0.2.1", "bn.js": "^4.11.8", "es6-promisify": "^5.0.0", "ethereumjs-tx": "^1.3.3", @@ -31,15 +31,15 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.2", - "@0xproject/utils": "^0.2.0", + "@0xproject/tslint-config": "^0.4.3", + "@0xproject/utils": "^0.2.1", "@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.4", + "chai-as-promised-typescript-typings": "^0.0.5", "chai-typescript-typings": "^0.0.2", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 15f3c34a5..7dc6b0512 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, - "name": "@0xproject/testnet-faucets", - "version": "1.0.5", + "name": "@0xproject/kovan_faucets", + "version": "1.0.6", "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.30.0", - "@0xproject/utils": "^0.2.0", + "0x.js": "^0.30.1", + "@0xproject/utils": "^0.2.1", "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.2", + "@0xproject/tslint-config": "^0.4.3", "@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.4", + "web3-typescript-typings": "^0.9.5", "webpack": "^3.1.0", "webpack-node-externals": "^1.6.0" } diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index a53a8ab8a..bcffe5a8e 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/tslint-config", - "version": "0.4.2", + "version": "0.4.3", "description": "Lint rules related to 0xProject for TSLint", "main": "tslint.json", "scripts": { @@ -8,12 +8,22 @@ "clean": "shx rm -rf lib", "lint": "tslint --project . 'rules/**/*.ts'" }, - "files": ["tslint.js", "README.md", "LICENSE"], + "files": [ + "tslint.js", + "README.md", + "LICENSE" + ], "repository": { "type": "git", "url": "git://github.com/0xProject/0x.js.git" }, - "keywords": ["tslint", "config", "0xProject", "typescript", "ts"], + "keywords": [ + "tslint", + "config", + "0xProject", + "typescript", + "ts" + ], "author": { "name": "Fabio Berger", "email": "fabio@0xproject.com" diff --git a/packages/types/package.json b/packages/types/package.json index ef8c29c7c..8a8244950 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "0.1.4", + "version": "0.1.5", "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.2", + "@0xproject/tslint-config": "^0.4.3", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1" }, "dependencies": { - "@0xproject/utils": "^0.2.0", + "@0xproject/utils": "^0.2.1", "web3": "^0.20.0" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 7cc58c35b..b1f8b3792 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/utils", - "version": "0.2.0", + "version": "0.2.1", "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.2", + "@0xproject/tslint-config": "^0.4.3", "@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 5bf357566..6dddf22aa 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.4", + "version": "0.9.5", "description": "Typescript type definitions for web3", "main": "index.d.ts", "types": "index.d.ts", @@ -12,7 +12,9 @@ "url": "git+https://github.com/0xProject/0x.js.git" }, "author": "Fabio Berger", - "contributors": ["Leonid Logvinov <logvinov.leon@gmail.com>"], + "contributors": [ + "Leonid Logvinov <logvinov.leon@gmail.com>" + ], "license": "Apache-2.0", "bugs": { "url": "https://github.com/0xProject/0x.js/issues" diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index f2802bfbf..a0e15b48d 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.5", + "version": "0.1.6", "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.2", - "@0xproject/types": "^0.1.4", + "@0xproject/tslint-config": "^0.4.3", + "@0xproject/types": "^0.1.5", "@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.4" + "web3-typescript-typings": "^0.9.5" }, "dependencies": { - "@0xproject/utils": "^0.2.0", + "@0xproject/utils": "^0.2.1", "lodash": "^4.17.4", "web3": "^0.20.0" } diff --git a/packages/website/package.json b/packages/website/package.json index 7d0f775d4..fcfa12301 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.7", + "version": "0.0.8", "private": true, "description": "Website and 0x portal dapp", "scripts": { @@ -8,12 +8,9 @@ "clean": "shx rm -f public/bundle*", "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "dev": "webpack-dev-server --content-base public --https", - "update_contracts": - "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../website/contracts; done;", - "deploy_staging": - "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", - "deploy_live": - "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers" + "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../website/contracts; done;", + "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", + "deploy_live": "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers" }, "config": { "artifacts": "Mintable" @@ -21,9 +18,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.30.0", - "@0xproject/subproviders": "^0.3.1", - "@0xproject/utils": "^0.2.0", + "0x.js": "^0.30.1", + "@0xproject/subproviders": "^0.3.2", + "@0xproject/utils": "^0.2.1", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", @@ -101,7 +98,7 @@ "style-loader": "0.13.x", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.4", + "web3-typescript-typings": "^0.9.5", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", "webpack-dev-server": "^2.5.0" |