Merge branch 'development' into addExtraDocs

* development: (29 commits)
  Set Lodash dep to an exact version since newer versions introduced breaking changes
  Update Kovan Ethertoken Address
  Update deployer version since manual re-publish
  Add new entry into CHANGELOG
  Fix bad merge
  Update yarn.lock
  Change title
  Add Blake and Zach to About page
  Re-size Jacob and Tom's images
  Manually publish 0x.js back to a working state
  Publish
  Publish
  Fix 0x.js assets
  Remove assets from connect and _bundles from packages that don't generate the folder
  Publish
  Fix packages that aren't working as expected
  Make new packages default to public on publish
  Add new public packages to top-level README
  Update top-level package.json
  Fix incorrect new versions
  ...

# Conflicts:
#	packages/0x.js/package.json
#	packages/connect/package.json
#	packages/json-schemas/package.json
#	packages/sol-cov/package.json
This commit is contained in:
Fabio Berger
2018-03-20 11:52:22 +00:00
62 changed files with 8333 additions and 271 deletions

View File

@@ -18,24 +18,26 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
### Published Packages
| Package | Version | Description |
| ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
| [`0x.js`](/packages/0x.js) | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages |
| [`@0xproject/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0xproject/base-contract.svg)](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts |
| [`@0xproject/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the Standard Relayer API |
| [`@0xproject/deployer`](/packages/deployer) | [![npm](https://img.shields.io/npm/v/@0xproject/deployer.svg)](https://www.npmjs.com/package/@0xproject/deployer) | Solidity project compiler and deployer framework |
| [`@0xproject/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0xproject/dev-utils.svg)](https://www.npmjs.com/package/@0xproject/dev-utils) | Dev utils to be shared across 0x projects and packages |
| [`@0xproject/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg)](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas |
| [`@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-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/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) |
| [`@0xproject/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg)](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x development TSLint rules |
| [`@0xproject/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg)](https://www.npmjs.com/package/@0xproject/types) | Shared type declarations |
| [`@0xproject/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils) | Shared utilities |
| [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg)](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper |
| Package | Version | Description |
| ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
| [`0x.js`](/packages/0x.js) | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages |
| [`@0xproject/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0xproject/base-contract.svg)](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts |
| [`@0xproject/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the Standard Relayer API |
| [`@0xproject/deployer`](/packages/deployer) | [![npm](https://img.shields.io/npm/v/@0xproject/deployer.svg)](https://www.npmjs.com/package/@0xproject/deployer) | Solidity project compiler and deployer framework |
| [`@0xproject/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0xproject/dev-utils.svg)](https://www.npmjs.com/package/@0xproject/dev-utils) | Dev utils to be shared across 0x projects and packages |
| [`@0xproject/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg)](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas |
| [`@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-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 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) |
| [`@0xproject/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg)](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x development TSLint rules |
| [`@0xproject/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg)](https://www.npmjs.com/package/@0xproject/types) | Shared type declarations |
| [`@0xproject/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils) | Shared utilities |
| [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg)](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper |
### TypeScript Typings

View File

@@ -17,7 +17,7 @@
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
},
"devDependencies": {
"@0xproject/utils": "^0.4.1",
"@0xproject/utils": "^0.4.2",
"async-child-process": "^1.1.1",
"coveralls": "^3.0.0",
"ethereumjs-testrpc": "^6.0.3",

View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.33.2 - _TBD, 2018_
## v0.34.0 - _TBD_
* Update Kovan EtherToken artifact address to match TokenRegistry.
## v0.33.2 - _March 18, 2018_
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
* Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "0.33.1",
"version": "0.33.6",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
@@ -34,7 +34,10 @@
"config": {
"artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken",
"postpublish": {
"assets": ["_bundles/index.js", "_bundles/index.min.js"],
"assets": [
"packages/0x.js/_bundles/index.js",
"packages/0x.js/_bundles/index.min.js"
],
"docPublishConfigs": {
"extraFileIncludes": ["../types/src/index.ts"],
"s3BucketPath": "s3://doc-jsons/0xjs/",
@@ -51,13 +54,13 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.2.5",
"@0xproject/dev-utils": "^0.2.1",
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/abi-gen": "^0.2.7",
"@0xproject/dev-utils": "^0.3.2",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/bintrees": "^1.0.2",
"@types/jsonschema": "^1.1.1",
"@types/lodash": "^4.14.86",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
@@ -65,9 +68,9 @@
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-as-promised-typescript-typings": "^0.0.10",
"chai-as-promised-typescript-typings": "^0.0.12",
"chai-bignumber": "^2.0.1",
"chai-typescript-typings": "^0.0.4",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"json-loader": "^0.5.4",
@@ -90,26 +93,26 @@
"webpack": "^3.1.0"
},
"dependencies": {
"@0xproject/assert": "^0.2.0",
"@0xproject/base-contract": "^0.0.3",
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/web3-wrapper": "^0.2.1",
"@0xproject/assert": "^0.2.3",
"@0xproject/base-contract": "^0.0.5",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-blockstream": "^2.0.6",
"ethereumjs-util": "^5.1.1",
"ethers-contracts": "^2.2.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"uuid": "^3.1.0",
"web3": "^0.20.0",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -538,7 +538,7 @@
"address": "0x4e9aad8184de8833365fea970cd9149372fdf1e6"
},
"42": {
"address": "0xf18e504561f4347bea557f3d4558f559dddbae7f"
"address": "0xd0a1e359811322d97991e03f863a0c30c2cf029c"
},
"50": {
"address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"

View File

@@ -1,6 +1,6 @@
# CHANGELOG
## v0.2.5 - _TBD, 2018_
## v0.2.5 - _March 18, 2018_
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/abi-gen",
"version": "0.2.5",
"version": "0.2.7",
"description": "Generate contract wrappers from ABI and handlebars templates",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
"@0xproject/utils": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"chalk": "^2.3.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
@@ -34,8 +34,8 @@
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/glob": "^5.0.33",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",
@@ -46,9 +46,9 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,13 +1,13 @@
{
"name": "@0xproject/assert",
"version": "0.2.0",
"version": "0.2.3",
"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",
"scripts": {
"build:watch": "tsc -w",
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf _bundles lib test_temp scripts",
"clean": "shx rm -rf lib test_temp scripts",
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
"run_mocha": "mocha lib/test/**/*_test.js",
"prepublishOnly": "run-p build",
@@ -26,29 +26,29 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
"nyc": "^11.0.1",
"chai": "^4.0.1",
"chai-typescript-typings": "^0.0.4",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/utils": "^0.4.1",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/utils": "^0.4.3",
"lodash": "^4.17.4",
"valid-url": "^1.0.9"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/base-contract",
"version": "0.0.3",
"version": "0.0.5",
"description": "0x Base TS contract",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,9 +20,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -30,15 +30,15 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.3.1",
"@0xproject/web3-wrapper": "^0.2.1",
"@0xproject/types": "^0.4.1",
"@0xproject/web3-wrapper": "^0.3.1",
"ethers-contracts": "^2.2.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"lodash": "^4.17.4",
"web3": "^0.20.0",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "chai-as-promised-typescript-typings",
"version": "0.0.10",
"version": "0.0.12",
"description": "Typescript type definitions for chai-as-promised",
"main": "index.d.ts",
"types": "index.d.ts",
@@ -22,14 +22,14 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/chai-as-promised-typescript-typings#readme",
"dependencies": {
"chai-typescript-typings": "^0.0.4"
"chai-typescript-typings": "^0.0.6"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/monorepo-scripts": "^0.1.14",
"copyfiles": "^1.2.0",
"shx": "^0.2.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "chai-typescript-typings",
"version": "0.0.4",
"version": "0.0.6",
"description": "Typescript type definitions for chai",
"main": "index.d.ts",
"types": "index.d.ts",
@@ -18,11 +18,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/chai-typescript-typings#readme",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/monorepo-scripts": "^0.1.14",
"copyfiles": "^1.2.0",
"shx": "^0.2.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
# CHANGELOG
## v0.6.3 - _TBD, 2018_
## v0.6.4 - _March 18, 2018_
* Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
"version": "0.6.3",
"version": "0.6.6",
"description": "A javascript library for interacting with the standard relayer api",
"keywords": [
"connect",
@@ -14,7 +14,7 @@
"scripts": {
"build:watch": "tsc -w",
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf _bundles lib test_temp scripts",
"clean": "shx rm -rf lib test_temp scripts",
"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",
@@ -28,7 +28,7 @@
},
"config": {
"postpublish": {
"assets": ["_bundles/index.js", "_bundles/index.min.js"],
"assets": [],
"docPublishConfigs": {
"s3BucketPath": "s3://doc-jsons/connect/",
"s3StagingBucketPath": "s3://staging-doc-jsons/connect/"
@@ -49,39 +49,39 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": {
"@0xproject/assert": "^0.2.0",
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/assert": "^0.2.3",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
"query-string": "^5.0.1",
"websocket": "^1.0.25"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/fetch-mock": "^5.12.1",
"@types/lodash": "^4.14.86",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/query-string": "^5.0.1",
"@types/websocket": "^0.0.34",
"nyc": "^11.0.1",
"async-child-process": "^1.1.1",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-as-promised-typescript-typings": "^0.0.10",
"chai-typescript-typings": "^0.0.4",
"chai-as-promised-typescript-typings": "^0.0.12",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"fetch-mock": "^5.13.1",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typedoc": "~0.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "contracts",
"version": "2.1.15",
"version": "2.1.19",
"description": "Smart contract components of 0x protocol",
"main": "index.js",
"directories": {
@@ -40,21 +40,21 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.2.1",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/dev-utils": "^0.3.2",
"@0xproject/tslint-config": "^0.4.12",
"@types/bluebird": "^3.5.3",
"@types/lodash": "^4.14.86",
"@types/lodash": "4.14.104",
"@types/node": "^8.0.53",
"@types/request-promise-native": "^1.0.2",
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-as-promised-typescript-typings": "^0.0.10",
"chai-as-promised-typescript-typings": "^0.0.12",
"chai-bignumber": "^2.0.1",
"chai-typescript-typings": "^0.0.4",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"prettier": "^1.11.1",
@@ -64,16 +64,16 @@
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.0",
"web3-typescript-typings": "^0.10.2",
"yargs": "^10.0.3"
},
"dependencies": {
"0x.js": "^0.33.1",
"@0xproject/deployer": "^0.2.1",
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/web3-wrapper": "^0.2.1",
"0x.js": "^0.33.6",
"@0xproject/deployer": "^0.3.3",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
"bluebird": "^3.5.0",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",

View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.3.0 - _TBD, 2018_
## v0.3.1 - _March 18, 2018_
* Add TS types for `yargs`
## v0.3.0 - _March 18, 2018_
* Add support for Solidity 0.4.20 and 0.4.21
* Replace `jsonrpcPort` config with `jsonrpcUrl` (#426)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/deployer",
"version": "0.2.1",
"version": "0.3.3",
"description": "Smart contract deployer of 0x protocol",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -43,26 +43,27 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/deployer/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/require-from-string": "^1.2.0",
"@types/yargs": "^11.0.0",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
"nyc": "^11.0.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"mocha": "^4.0.1",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.8.0",
"types-bn": "^0.0.1",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"dependencies": {
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/web3-wrapper": "^0.2.1",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
"ethereumjs-util": "^5.1.1",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
@@ -73,6 +74,6 @@
"yargs": "^10.0.3"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -0,0 +1,6 @@
.*
yarn-error.log
/src/
/scripts/
test/
tsconfig.json

View File

@@ -1,6 +1,11 @@
# CHANGELOG
## v0.3.0 - _TBD, 2018_
## v0.3.1 - _March 18, 2018_
* Reduce npm package size by adding an `.npmignore` file.
* Move `@0xproject/web3_wrapper` to dependencies from devDependencies.
## v0.3.0 - _March 18, 2018_
* Add coverage subprovider if SOLIDITY_COVERAGE env variable is true (#426)
* Refactor `BlockchainLifecycle` to work with in-process ganache (#426)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/dev-utils",
"version": "0.2.1",
"version": "0.3.2",
"description": "0x dev TS utils",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -25,17 +25,16 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/web3-wrapper": "^0.2.1",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"nyc": "^11.0.1",
"chai": "^4.0.1",
"chai-typescript-typings": "^0.0.4",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.8.0",
"types-bn": "^0.0.1",
@@ -43,10 +42,11 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/sol-cov": "^0.0.1",
"@0xproject/subproviders": "^0.7.0",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/sol-cov": "^0.0.4",
"@0xproject/subproviders": "^0.8.2",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
"ethereumjs-util": "^5.1.2",
"lodash": "^4.17.4",
"request-promise-native": "^1.0.5",
@@ -54,6 +54,6 @@
"web3-provider-engine": "^13.0.1"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "ethers-typescript-typings",
"version": "0.0.2",
"version": "0.0.4",
"description": "Typescript type definitions for ethers.js",
"main": "index.d.ts",
"types": "index.d.ts",
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethers-typescript-typings#readme",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/monorepo-scripts": "^0.1.14",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
"tslint": "5.8.0",
@@ -31,6 +31,6 @@
"typescript": "2.7.1"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/json-schemas",
"version": "0.7.14",
"version": "0.7.17",
"description": "0x-related json schemas",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -12,7 +12,7 @@
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"test:circleci": "yarn test:coverage",
"run_mocha": "mocha lib/test/**/*_test.js",
"clean": "shx rm -rf _bundles lib test_temp scripts",
"clean": "shx rm -rf lib test_temp scripts",
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"docs:stage": "yarn build && node ./scripts/stagedocs.js",
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
@@ -43,26 +43,26 @@
"lodash.values": "^4.3.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/utils": "^0.4.1",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@0xproject/utils": "^0.4.3",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",
"nyc": "^11.0.1",
"chai": "^4.0.1",
"chai-typescript-typings": "^0.0.4",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"lodash.foreach": "^4.5.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,5 +1,5 @@
CHANGELOG
## v0.1.13 - _TBD_
## v0.1.13 - _March 18, 2018_
* Add postpublish utils

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/monorepo-scripts",
"version": "0.1.12",
"version": "0.1.14",
"description": "Helper scripts for the monorepo",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -30,12 +30,15 @@
"typescript": "2.7.1"
},
"dependencies": {
"es6-promisify": "^5.0.0",
"async-child-process": "^1.1.1",
"publish-release": "0xproject/publish-release",
"chalk": "^2.3.0",
"es6-promisify": "^5.0.0",
"glob": "^7.1.2",
"lodash": "^4.17.4",
"publish-release": "0xproject/publish-release",
"semver-sort": "^0.0.4"
},
"publishConfig": {
"access": "public"
}
}

View File

@@ -1,9 +1,8 @@
{
"name": "@0xproject/react-docs-example",
"version": "0.0.1",
"private": true,
"description":
"An example app using react-docs",
"name": "@0xproject/react-docs-example",
"version": "0.0.4",
"description": "An example app using react-docs",
"scripts": {
"lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
"build": "tsc",
@@ -11,28 +10,26 @@
"build:watch": "tsc -w",
"clean": "shx rm -rf lib; shx rm -f public/bundle*",
"dev": "webpack-dev-server --open",
"deploy_example":
"npm run build:example; aws s3 sync ./public/. s3://react-docs-example --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
"deploy_example": "npm run build:example; aws s3 sync ./public/. s3://react-docs-example --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
},
"author": "Fabio Berger",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/0xProject/0x-monorepo/issues"
},
"homepage":
"https://github.com/0xProject/0x-monorepo/packages/react-docs-example/README.md",
"homepage": "https://github.com/0xProject/0x-monorepo/packages/react-docs-example/README.md",
"repository": {
"type": "git",
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.9",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/react": "^15.0.15",
"@types/react-dom": "^0.14.23",
"@types/react-tap-event-plugin": "0.0.30",
"@types/lodash": "^4.14.86",
"@types/node": "^8.0.53",
"awesome-typescript-loader": "^3.1.3",
"copyfiles": "^1.2.0",
"css-loader": "^0.28.9",
@@ -40,16 +37,16 @@
"less": "^2.7.2",
"less-loader": "^2.2.3",
"raw-loader": "^0.5.1",
"shx": "^0.2.2",
"source-map-loader": "^0.2.3",
"style-loader": "^0.20.2",
"shx": "^0.2.2",
"tslint": "^5.9.1",
"typescript": "2.7.1",
"webpack": "^3.11.0",
"webpack-dev-server": "^2.11.1"
},
"dependencies": {
"@0xproject/react-docs": "^0.0.1",
"@0xproject/react-docs": "^0.0.4",
"basscss": "^8.0.3",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",

View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.0.2 - _TBD, 2018_
## v0.0.3 - _March 18, 2018_
* Move TS typings from devDependencies to dependencies since they are needed by the package user.
## v0.0.2 - _March 18, 2018_
* Move example out into a separate sub-package
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-docs",
"version": "0.0.1",
"version": "0.0.4",
"description": "React documentation component for rendering TypeDoc & Doxity generated JSON",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -21,24 +21,24 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.2.1",
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.9",
"@types/lodash": "^4.14.86",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/react": "^15.0.15",
"@types/react-dom": "^0.14.23",
"@types/react-scroll": "0.0.31",
"@types/react-tap-event-plugin": "0.0.30",
"@0xproject/dev-utils": "^0.3.2",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
"tslint": "^5.9.1",
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/react-shared": "^0.0.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/react-shared": "^0.0.4",
"@0xproject/utils": "^0.4.3",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/react": "^15.0.15",
"@types/react-dom": "^0.14.23",
"@types/react-scroll": "0.0.31",
"@types/react-tap-event-plugin": "0.0.30",
"basscss": "^8.0.3",
"compare-versions": "^3.0.1",
"lodash": "^4.17.4",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-shared",
"version": "0.0.1",
"version": "0.0.4",
"description": "0x shared react components",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -21,21 +21,21 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.2.1",
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.9",
"@types/lodash": "^4.14.86",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/react": "^15.0.15",
"@types/react-dom": "^0.14.23",
"@types/react-scroll": "0.0.31",
"@0xproject/dev-utils": "^0.3.2",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
"tslint": "^5.9.1",
"typescript": "2.7.1"
},
"dependencies": {
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/react": "^15.0.15",
"@types/react-dom": "^0.14.23",
"@types/react-scroll": "0.0.31",
"basscss": "^8.0.3",
"is-mobile": "^0.2.2",
"lodash": "^4.17.4",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-cov",
"version": "0.0.1",
"version": "0.0.4",
"description": "Generate coverage reports for Solidity code",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -38,7 +38,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
"dependencies": {
"@0xproject/subproviders": "^0.7.0",
"@0xproject/subproviders": "^0.8.2",
"@0xproject/utils": "^0.3.4",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
@@ -51,23 +51,26 @@
"web3": "^0.20.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.9",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/istanbul": "^0.4.29",
"@types/node": "^8.0.53",
"@types/mocha": "^2.2.42",
"sinon": "^4.0.0",
"copyfiles": "^1.2.0",
"nyc": "^11.0.1",
"@types/node": "^8.0.53",
"chai": "^4.0.1",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"chai-typescript-typings": "^0.0.4",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"sinon": "^4.0.0",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.11"
},
"publishConfig": {
"access": "public"
}
}

View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.0.2 - _TBD, 2018_
## v0.0.3 - _TBD, 2018_
* Added postman collection unit tests (#451)
## v0.0.2 - _March 18, 2018_
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)

View File

@@ -116,3 +116,9 @@ yarn build
```bash
yarn lint
```
### Run Tests
```bash
yarn test
```

View File

@@ -1,14 +1,19 @@
{
"name": "@0xproject/sra-report",
"version": "0.0.1",
"version": "0.0.5",
"description": "Generate reports for standard relayer API compliance",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
"build:watch": "tsc -w",
"lint": "tslint --project . 'src/**/*.ts'",
"clean": "shx rm -rf lib scripts",
"build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts"
"build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
"build": "tsc",
"test": "run-s clean build copy_test_environments copy_test_fixtures run_mocha",
"copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
"copy_test_environments": "copyfiles -u 2 './test/environments/**/*.json' ./lib/test/environments",
"run_mocha": "mocha lib/test/**/*_test.js"
},
"bin": {
"sra-report": "lib/index.js"
@@ -23,23 +28,33 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
"dependencies": {
"0x.js": "^0.33.1",
"@0xproject/assert": "^0.2.0",
"@0xproject/connect": "^0.6.3",
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/utils": "^0.4.1",
"0x.js": "^0.33.6",
"@0xproject/assert": "^0.2.3",
"@0xproject/connect": "^0.6.6",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/utils": "^0.4.3",
"chalk": "^2.3.0",
"lodash": "^4.17.4",
"newman": "^3.9.3",
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.48",
"@types/nock": "^9.1.2",
"@types/node": "^8.0.53",
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-as-promised-typescript-typings": "^0.0.10",
"chai-typescript-typings": "^0.0.4",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"mocha": "^4.0.1",
"nock": "^9.2.3",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"

View File

@@ -1,6 +1,28 @@
declare module 'dirty-chai';
declare module 'newman' {
export interface NewmanRunSummary {
run: NewmanRun;
}
export interface NewmanRun {
executions: NewmanRunExecution[];
}
export interface NewmanRunExecution {
item: NewmanRunExecutionItem;
assertions: NewmanRunExecutionAssertion[];
}
export interface NewmanRunExecutionItem {
name: string;
}
export interface NewmanRunExecutionAssertion {
assertion: string;
error: NewmanRunExecutionAssertionError;
}
export interface NewmanRunExecutionAssertionError {
message: string;
}
// tslint:disable-next-line:completed-docs
export function run(options: any, callback?: () => void): void;
export function run(options: any, callback?: (err: Error | null, summary: NewmanRunSummary) => void): void;
}
declare module '*.json' {

View File

@@ -7,11 +7,11 @@ import * as _ from 'lodash';
import * as newman from 'newman';
import * as yargs from 'yargs';
import * as sraReportCollectionJSON from '../postman_configs/collections/sra_report.postman_collection.json';
import * as sraReportCollectionJSON from '../../postman_collections/sra_report.postman_collection.json';
import { postmanEnvironmentFactory } from './postman_environment_factory';
import { utils } from './utils';
const newmanRunAsync = promisify<void>(newman.run);
const DEFAULT_NETWORK_ID = 1;
const SUPPORTED_NETWORK_IDS = [1, 3, 4, 42];
@@ -96,6 +96,6 @@ const mainAsync = async () => {
exportEnvironment: args.exportEnvironment,
...newmanReporterOptions,
};
await newmanRunAsync(newmanRunOptions);
await utils.newmanRunAsync(newmanRunOptions);
};
mainAsync().catch(logUtils.log);

View File

@@ -0,0 +1,6 @@
import { promisify } from '@0xproject/utils';
import { NewmanRunSummary, run as newmanRun } from 'newman';
export const utils = {
newmanRunAsync: promisify<NewmanRunSummary>(newmanRun),
};

View File

@@ -0,0 +1,223 @@
{
"id": "f23e415f-99a8-4d47-8796-6400af77d85f",
"name": "SRA Report",
"values": [
{
"type": "any",
"value": "{\"id\":\"/Number\",\"type\":\"string\",\"pattern\":\"^\\\\d+(\\\\.\\\\d+)?$\"}",
"key": "NumberSchema"
},
{
"type": "any",
"value": "{\"id\":\"/Address\",\"type\":\"string\",\"pattern\":\"^0x[0-9a-f]{40}$\"}",
"key": "AddressSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/ECSignature\",\"properties\":{\"v\":{\"type\":\"number\",\"minimum\":27,\"maximum\":28},\"r\":{\"$ref\":\"/ECSignatureParameter\"},\"s\":{\"$ref\":\"/ECSignatureParameter\"}},\"required\":[\"v\",\"r\",\"s\"],\"type\":\"object\"}",
"key": "ECSignatureSchema"
},
{
"type": "any",
"value": "{\"id\":\"/ECSignatureParameter\",\"type\":\"string\",\"pattern\":\"^0[xX][0-9A-Fa-f]{64}$\"}",
"key": "ECSignatureParameterSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/IndexFilterValues\",\"additionalProperties\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/Address\"},{\"$ref\":\"/OrderHashSchema\"}]},\"type\":\"object\"}",
"key": "IndexFilterValuesSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/OrderCancellationRequests\",\"type\":\"array\",\"items\":{\"properties\":{\"order\":{\"$ref\":\"/Order\"},\"takerTokenCancelAmount\":{\"$ref\":\"/Number\"}},\"required\":[\"order\",\"takerTokenCancelAmount\"],\"type\":\"object\"}}",
"key": "OrderCancellationRequestsSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/OrderFillOrKillRequests\",\"type\":\"array\",\"items\":{\"properties\":{\"signedOrder\":{\"$ref\":\"/SignedOrder\"},\"fillTakerAmount\":{\"$ref\":\"/Number\"}},\"required\":[\"signedOrder\",\"fillTakerAmount\"],\"type\":\"object\"}}",
"key": "OrderFillOrKillRequestsSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/OrderFillRequests\",\"type\":\"array\",\"items\":{\"properties\":{\"signedOrder\":{\"$ref\":\"/SignedOrder\"},\"takerTokenFillAmount\":{\"$ref\":\"/Number\"}},\"required\":[\"signedOrder\",\"takerTokenFillAmount\"],\"type\":\"object\"}}",
"key": "OrderFillRequestsSchema"
},
{
"type": "any",
"value": "{\"id\":\"/OrderHashSchema\",\"type\":\"string\",\"pattern\":\"^0x[0-9a-fA-F]{64}$\"}",
"key": "OrderHashSchemaSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/Order\",\"properties\":{\"maker\":{\"$ref\":\"/Address\"},\"taker\":{\"$ref\":\"/Address\"},\"makerFee\":{\"$ref\":\"/Number\"},\"takerFee\":{\"$ref\":\"/Number\"},\"makerTokenAmount\":{\"$ref\":\"/Number\"},\"takerTokenAmount\":{\"$ref\":\"/Number\"},\"makerTokenAddress\":{\"$ref\":\"/Address\"},\"takerTokenAddress\":{\"$ref\":\"/Address\"},\"salt\":{\"$ref\":\"/Number\"},\"feeRecipient\":{\"$ref\":\"/Address\"},\"expirationUnixTimestampSec\":{\"$ref\":\"/Number\"},\"exchangeContractAddress\":{\"$ref\":\"/Address\"}},\"required\":[\"maker\",\"taker\",\"makerFee\",\"takerFee\",\"makerTokenAmount\",\"takerTokenAmount\",\"salt\",\"feeRecipient\",\"expirationUnixTimestampSec\",\"exchangeContractAddress\"],\"type\":\"object\"}",
"key": "OrderSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/SignedOrder\",\"allOf\":[{\"$ref\":\"/Order\"},{\"properties\":{\"ecSignature\":{\"$ref\":\"/ECSignature\"}},\"required\":[\"ecSignature\"]}]}",
"key": "SignedOrderSchema"
},
{
"type": "any",
"value": "{\"id\":\"/signedOrdersSchema\",\"type\":\"array\",\"items\":{\"$ref\":\"/SignedOrder\"}}",
"key": "signedOrdersSchemaSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/BlockParam\",\"oneOf\":[{\"type\":\"number\"},{\"enum\":[\"latest\",\"earliest\",\"pending\"]}]}",
"key": "BlockParamSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/BlockRange\",\"properties\":{\"fromBlock\":{\"$ref\":\"/BlockParam\"},\"toBlock\":{\"$ref\":\"/BlockParam\"}},\"type\":\"object\"}",
"key": "BlockRangeSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/Token\",\"properties\":{\"name\":{\"type\":\"string\"},\"symbol\":{\"type\":\"string\"},\"decimals\":{\"type\":\"number\"},\"address\":{\"$ref\":\"/Address\"}},\"required\":[\"name\",\"symbol\",\"decimals\",\"address\"],\"type\":\"object\"}",
"key": "TokenSchema"
},
{
"type": "any",
"value": "{\"id\":\"/JsNumber\",\"type\":\"number\",\"minimum\":0}",
"key": "JsNumberSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/TxData\",\"properties\":{\"from\":{\"$ref\":\"/Address\"},\"to\":{\"$ref\":\"/Address\"},\"value\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/JsNumber\"}]},\"gas\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/JsNumber\"}]},\"gasPrice\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/JsNumber\"}]},\"data\":{\"type\":\"string\",\"pattern\":\"^0x[0-9a-f]*$\"},\"nonce\":{\"type\":\"number\",\"minimum\":0}},\"required\":[\"from\"],\"type\":\"object\",\"additionalProperties\":false}",
"key": "TxDataSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiErrorResponse\",\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"number\"},\"reason\":{\"type\":\"string\"},\"validationErrors\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"properties\":{\"field\":{\"type\":\"string\"},\"code\":{\"type\":\"number\"},\"reason\":{\"type\":\"string\"}},\"required\":[\"field\",\"code\",\"reason\"]}}},\"required\":[\"code\",\"reason\"]}",
"key": "RelayerApiErrorResponseSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiFeesPayload\",\"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\",\"expirationUnixTimestampSec\",\"salt\"]}",
"key": "RelayerApiFeesPayloadSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiFeesResponse\",\"type\":\"object\",\"properties\":{\"makerFee\":{\"$ref\":\"/Number\"},\"takerFee\":{\"$ref\":\"/Number\"},\"feeRecipient\":{\"$ref\":\"/Address\"}},\"required\":[\"makerFee\",\"takerFee\",\"feeRecipient\"]}",
"key": "RelayerApiFeesResponseSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiOrderBookResponse\",\"type\":\"object\",\"properties\":{\"bids\":{\"$ref\":\"/signedOrdersSchema\"},\"asks\":{\"$ref\":\"/signedOrdersSchema\"}},\"required\":[\"bids\",\"asks\"]}",
"key": "RelayerApiOrderBookResponseSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiTokenPairsResponse\",\"type\":\"array\",\"items\":{\"properties\":{\"tokenA\":{\"$ref\":\"/RelayerApiTokenTradeInfo\"},\"tokenB\":{\"$ref\":\"/RelayerApiTokenTradeInfo\"}},\"required\":[\"tokenA\",\"tokenB\"],\"type\":\"object\"}}",
"key": "RelayerApiTokenPairsResponseSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiTokenTradeInfo\",\"type\":\"object\",\"properties\":{\"address\":{\"$ref\":\"/Address\"},\"minAmount\":{\"$ref\":\"/Number\"},\"maxAmount\":{\"$ref\":\"/Number\"},\"precision\":{\"type\":\"number\"}},\"required\":[\"address\"]}",
"key": "RelayerApiTokenTradeInfoSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiOrderbookChannelSubscribe\",\"type\":\"object\",\"properties\":{\"type\":{\"enum\":[\"subscribe\"]},\"channel\":{\"enum\":[\"orderbook\"]},\"requestId\":{\"type\":\"number\"},\"payload\":{\"$ref\":\"/RelayerApiOrderbookChannelSubscribePayload\"}},\"required\":[\"type\",\"channel\",\"requestId\",\"payload\"]}",
"key": "RelayerApiOrderbookChannelSubscribeSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiOrderbookChannelSubscribePayload\",\"type\":\"object\",\"properties\":{\"baseTokenAddress\":{\"$ref\":\"/Address\"},\"quoteTokenAddress\":{\"$ref\":\"/Address\"},\"snapshot\":{\"type\":\"boolean\"},\"limit\":{\"type\":\"number\"}},\"required\":[\"baseTokenAddress\",\"quoteTokenAddress\"]}",
"key": "RelayerApiOrderbookChannelSubscribePayloadSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiOrderbookChannelUpdate\",\"type\":\"object\",\"properties\":{\"type\":{\"enum\":[\"update\"]},\"channel\":{\"enum\":[\"orderbook\"]},\"requestId\":{\"type\":\"number\"},\"payload\":{\"$ref\":\"/SignedOrder\"}},\"required\":[\"type\",\"channel\",\"requestId\",\"payload\"]}",
"key": "RelayerApiOrderbookChannelUpdateSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiOrderbookChannelSnapshot\",\"type\":\"object\",\"properties\":{\"type\":{\"enum\":[\"snapshot\"]},\"channel\":{\"enum\":[\"orderbook\"]},\"requestId\":{\"type\":\"number\"},\"payload\":{\"$ref\":\"/RelayerApiOrderbookChannelSnapshotPayload\"}},\"required\":[\"type\",\"channel\",\"requestId\",\"payload\"]}",
"key": "RelayerApiOrderbookChannelSnapshotSchema"
},
{
"type": "any",
"value":
"{\"id\":\"/RelayerApiOrderbookChannelSnapshotPayload\",\"type\":\"object\",\"properties\":{\"bids\":{\"$ref\":\"/signedOrdersSchema\"},\"asks\":{\"$ref\":\"/signedOrdersSchema\"}},\"required\":[\"bids\",\"asks\"]}",
"key": "RelayerApiOrderbookChannelSnapshotPayloadSchema"
},
{
"type": "any",
"value":
"[\"NumberSchema\",\"AddressSchema\",\"ECSignatureSchema\",\"ECSignatureParameterSchema\",\"IndexFilterValuesSchema\",\"OrderCancellationRequestsSchema\",\"OrderFillOrKillRequestsSchema\",\"OrderFillRequestsSchema\",\"OrderHashSchemaSchema\",\"OrderSchema\",\"SignedOrderSchema\",\"signedOrdersSchemaSchema\",\"BlockParamSchema\",\"BlockRangeSchema\",\"TokenSchema\",\"JsNumberSchema\",\"TxDataSchema\",\"RelayerApiErrorResponseSchema\",\"RelayerApiFeesPayloadSchema\",\"RelayerApiFeesResponseSchema\",\"RelayerApiOrderBookResponseSchema\",\"RelayerApiTokenPairsResponseSchema\",\"RelayerApiTokenTradeInfoSchema\",\"RelayerApiOrderbookChannelSubscribeSchema\",\"RelayerApiOrderbookChannelSubscribePayloadSchema\",\"RelayerApiOrderbookChannelUpdateSchema\",\"RelayerApiOrderbookChannelSnapshotSchema\",\"RelayerApiOrderbookChannelSnapshotPayloadSchema\"]",
"key": "schemaKeys"
},
{
"type": "any",
"value": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
"key": "tokenContractAddress1"
},
{
"type": "any",
"value": "0xe41d2489571d322189246dafa5ebde1f4699f498",
"key": "tokenContractAddress2"
},
{
"type": "any",
"value": "0x12459c951127e0c374ff9105dda097662a027093",
"key": "exchangeContractAddress"
},
{
"type": "any",
"value":
"{\"orderHash\":\"0xe91e990bab4c9c6bd60ff3673222390e3da8b7bd9a50eab98a8cb20723b24ee1\",\"exchangeContractAddress\":\"0x12459c951127e0c374ff9105dda097662a027093\",\"maker\":\"0x93690d55b14d701c259ba7960395c095aa52c3a8\",\"taker\":\"0x0000000000000000000000000000000000000000\",\"makerTokenAddress\":\"0x2956356cd2a2bf3202f771f50d3d14a367b48070\",\"takerTokenAddress\":\"0x0abdace70d3790235af448c88547603b945604ea\",\"feeRecipient\":\"0xa258b39954cef5cb142fd567a46cddb31a670124\",\"makerTokenAmount\":\"2926675830000000000\",\"takerTokenAmount\":\"24386933000000000000000\",\"makerFee\":\"18419638100000000000\",\"takerFee\":\"35812978500000000000\",\"expirationUnixTimestampSec\":\"9223372036854775807\",\"salt\":\"89583415499996246176114840147523733506098603782358761236056286417408784066968\",\"ecSignature\":{\"r\":\"0x32eb5bbf713210274ddd885e6b555699bc0189676ff73a4dc98c4cac41d3a6a6\",\"s\":\"0x193eb9440df49dc7817b6142c0be021cd1f9fc0916d86c7b49e9e07a402f3645\",\"v\":28}}",
"key": "order"
},
{
"type": "any",
"value": "0x93690d55b14d701c259ba7960395c095aa52c3a8",
"key": "orderMaker"
},
{
"type": "any",
"value": "0x0000000000000000000000000000000000000000",
"key": "orderTaker"
},
{
"type": "any",
"value": "0xa258b39954cef5cb142fd567a46cddb31a670124",
"key": "orderFeeRecipient"
},
{
"type": "any",
"value": "0xe91e990bab4c9c6bd60ff3673222390e3da8b7bd9a50eab98a8cb20723b24ee1",
"key": "orderHash"
},
{
"type": "any",
"value": "https://example.com",
"key": "url"
}
],
"_postman_variable_scope": "environment",
"_postman_exported_at": "2018-03-10T23:53:03.913Z",
"_postman_exported_using": "Newman/3.9.3"
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,30 @@
[
{
"tokenA": {
"address": "4a6b4ccb1b6faa2625fe562bdd9a23260359",
"minAmount": "1",
"maxAmount": "999999999999999999999",
"precision": 8
},
"tokenB": {
"address": "0x01b3ec4aae1b8729529beb4965f27d008788b0eb",
"minAmount": "1",
"maxAmount": 999999999999999999999,
"precision": 8
}
},
{
"tokenA": {
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
"minAmount": "1",
"maxAmount": "999999999999999999999",
"precision": 8
},
"tokenX": {
"address": "0x0371a82e4a9d0a4312f3ee2ac9c6958512891372",
"minAmount": "1",
"maxAmount": "999999999999999999999",
"precision": 8
}
}
]

View File

@@ -0,0 +1,16 @@
[
{
"tokenA": {
"address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
"minAmount": "1",
"maxAmount": "999999999999999999999",
"precision": 8
},
"tokenB": {
"address": "0xe41d2489571d322189246dafa5ebde1f4699f498",
"minAmount": "1",
"maxAmount": "999999999999999999999",
"precision": 8
}
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,76 @@
import 'mocha';
import * as nock from 'nock';
import * as defaultRequestTokenPairsResponseJSON from './fixtures/v0/token_pairs/default_request.json';
import * as malformedTokenPairsResponseJSON from './fixtures/v0/token_pairs/malformed.json';
import * as tokenAAndTokenBParamsTokenPairsResponseJSON from './fixtures/v0/token_pairs/token_a_and_token_b_params.json';
import * as tokenAParamTokenPairsResponseJSON from './fixtures/v0/token_pairs/token_a_param.json';
import * as tokenBParamTokenPairsResponseJSON from './fixtures/v0/token_pairs/token_b_param.json';
import { testRunner } from './test_runner';
describe('Postman Collection v0', () => {
const testRelayerUrl = 'https://example.com';
const nockScope = nock(testRelayerUrl);
afterEach(() => {
nock.cleanAll();
});
describe('GET /token_pairs', () => {
const postmanCollectionFolderName = 'GET /token_pairs';
const resourcePath = '/token_pairs';
describe('default request', () => {
const postmanCollectionRequestName = 'default request';
const nockInterceptor = nockScope.get(resourcePath);
testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
testRunner.runSchemaTests(
nockInterceptor,
postmanCollectionFolderName,
postmanCollectionRequestName,
malformedTokenPairsResponseJSON,
defaultRequestTokenPairsResponseJSON,
);
});
describe('tokenA param', () => {
const postmanCollectionRequestName = 'tokenA param';
const nockInterceptor = nockScope.get(resourcePath).query({
tokenA: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
});
testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
testRunner.runSchemaTests(
nockInterceptor,
postmanCollectionFolderName,
postmanCollectionRequestName,
malformedTokenPairsResponseJSON,
tokenAParamTokenPairsResponseJSON,
);
});
describe('tokenB param', () => {
const postmanCollectionRequestName = 'tokenB param';
const nockInterceptor = nockScope.get(resourcePath).query({
tokenB: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
});
testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
testRunner.runSchemaTests(
nockInterceptor,
postmanCollectionFolderName,
postmanCollectionRequestName,
malformedTokenPairsResponseJSON,
tokenBParamTokenPairsResponseJSON,
);
});
describe('tokenA and tokenB params', () => {
const postmanCollectionRequestName = 'tokenA and tokenB params';
const nockInterceptor = nockScope.get(resourcePath).query({
tokenA: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
tokenB: '0xe41d2489571d322189246dafa5ebde1f4699f498',
});
testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
testRunner.runSchemaTests(
nockInterceptor,
postmanCollectionFolderName,
postmanCollectionRequestName,
malformedTokenPairsResponseJSON,
tokenAAndTokenBParamsTokenPairsResponseJSON,
);
});
});
});

View File

@@ -0,0 +1,138 @@
import * as chai from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import * as dirtyChai from 'dirty-chai';
import * as _ from 'lodash';
import 'mocha';
import { NewmanRunExecution, NewmanRunExecutionAssertion, NewmanRunSummary } from 'newman';
import * as nock from 'nock';
import * as sraReportCollectionJSON from '../../postman_collections/sra_report.postman_collection.json';
import { utils } from '../src/utils';
import * as postmanEnvironmentJSON from './environments/postman_environment.json';
chai.config.includeStack = true;
chai.use(dirtyChai);
chai.use(chaiAsPromised);
const expect = chai.expect;
const CONTENT_TYPE_ASSERTION_NAME = 'Has Content-Type header with value application/json';
const SCHEMA_ASSERTION_NAME = 'Schema is valid';
const baseNewmanRunOptions = {
collection: sraReportCollectionJSON,
environment: postmanEnvironmentJSON,
reporter: {
cli: {
noConsole: true,
},
},
};
export const testRunner = {
runContentTypeTests(
nockInterceptor: nock.Interceptor,
postmanCollectionFolderName: string,
postmanCollectionRequestName: string,
) {
const newmanRunOptions = {
...baseNewmanRunOptions,
folder: postmanCollectionFolderName,
};
describe(CONTENT_TYPE_ASSERTION_NAME, () => {
it('fails when there are no headers', async () => {
nockInterceptor.reply(200, {});
const summary = await utils.newmanRunAsync(newmanRunOptions);
const error = findAssertionErrorIfExists(
summary,
postmanCollectionRequestName,
CONTENT_TYPE_ASSERTION_NAME,
);
const errorMessage = _.get(error, 'message');
expect(error).to.not.be.undefined();
expect(errorMessage).to.equal(`expected response to have header with key 'Content-Type'`);
});
it('fails when Content-Type header exists but not with value application/json', async () => {
const headers = {
'Content-Type': 'text/html',
};
nockInterceptor.reply(200, {}, headers);
const summary = await utils.newmanRunAsync(newmanRunOptions);
const error = findAssertionErrorIfExists(
summary,
postmanCollectionRequestName,
CONTENT_TYPE_ASSERTION_NAME,
);
const errorMessage = _.get(error, 'message');
expect(error).to.not.be.undefined();
expect(errorMessage).to.equal(`expected 'text/html' to include 'application/json'`);
});
it('passes when Content-Type header exists with value application/json', async () => {
const headers = {
'Content-Type': 'charset=utf-8; application/json',
};
nockInterceptor.reply(200, {}, headers);
const summary = await utils.newmanRunAsync(newmanRunOptions);
const error = findAssertionErrorIfExists(
summary,
postmanCollectionRequestName,
CONTENT_TYPE_ASSERTION_NAME,
);
expect(error).to.be.undefined();
});
});
},
runSchemaTests(
nockInterceptor: nock.Interceptor,
postmanCollectionFolderName: string,
postmanCollectionRequestName: string,
malformedJson: object,
correctJson: object,
) {
const newmanRunOptions = {
...baseNewmanRunOptions,
folder: postmanCollectionFolderName,
};
describe(SCHEMA_ASSERTION_NAME, () => {
it('fails when schema is invalid', async () => {
nockInterceptor.reply(200, malformedJson);
const summary = await utils.newmanRunAsync(newmanRunOptions);
const error = findAssertionErrorIfExists(summary, postmanCollectionRequestName, SCHEMA_ASSERTION_NAME);
const errorMessage = _.get(error, 'message');
expect(error).to.not.be.undefined();
expect(errorMessage).to.equal('expected false to be true');
});
it('passes when schema is valid', async () => {
nockInterceptor.reply(200, correctJson);
const summary = await utils.newmanRunAsync(newmanRunOptions);
const error = findAssertionErrorIfExists(summary, postmanCollectionRequestName, SCHEMA_ASSERTION_NAME);
const errorMessage = _.get(error, 'message');
expect(error).to.be.undefined();
});
});
},
};
function findAssertionErrorIfExists(
summary: NewmanRunSummary,
postmanCollectionRequestName: string,
postmanCollectionAssertionName: string,
) {
const matchingExecutionIfExists = _.find(summary.run.executions, (execution: NewmanRunExecution) => {
return execution.item.name === postmanCollectionRequestName;
});
if (_.isUndefined(matchingExecutionIfExists)) {
return undefined;
}
const matchingAssertionIfExists = _.find(
matchingExecutionIfExists.assertions,
(assertion: NewmanRunExecutionAssertion) => {
return assertion.assertion === postmanCollectionAssertionName;
},
);
if (_.isUndefined(matchingAssertionIfExists)) {
return undefined;
} else {
const error = matchingAssertionIfExists.error;
return error;
}
}

View File

@@ -5,6 +5,9 @@
},
"include": [
"./src/**/*",
"./test/**/*",
"../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
"../../node_modules/chai-typescript-typings/index.d.ts",
"../../node_modules/web3-typescript-typings/index.d.ts",
"../../node_modules/ethers-typescript-typings/index.d.ts"
]

View File

@@ -1,6 +1,6 @@
# CHANGELOG
## v0.8.0 - _TBD, 2018_
## v0.8.0 - _March 18, 2018_
* Export `GanacheSubprovider` and `Subprovider` (#426)
* Make all subproviders to derive from `Subprovider` (#426)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/subproviders",
"version": "0.7.0",
"version": "0.8.2",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"license": "Apache-2.0",
@@ -33,9 +33,9 @@
}
},
"dependencies": {
"@0xproject/assert": "^0.2.0",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/assert": "^0.2.3",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
"bn.js": "^4.11.8",
@@ -48,24 +48,24 @@
"semaphore-async-await": "^1.5.1",
"web3": "^0.20.0",
"web3-provider-engine": "^13.0.1",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/utils": "^0.4.1",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@0xproject/utils": "^0.4.3",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"nyc": "^11.0.1",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-as-promised-typescript-typings": "^0.0.10",
"chai-typescript-typings": "^0.0.4",
"chai-as-promised-typescript-typings": "^0.0.12",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.8.0",
"types-bn": "^0.0.1",
@@ -78,9 +78,9 @@
"@ledgerhq/hw-transport-node-hid": "^4.3.0"
},
"publishConfig": {
"access": "public"
"access": "public"
},
"browser": {
"ganache-core": false
"ganache-core": false
}
}

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/testnet-faucets",
"version": "1.0.16",
"version": "1.0.20",
"description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
"main": "server.js",
"scripts": {
@@ -15,9 +15,9 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.33.1",
"@0xproject/subproviders": "^0.7.0",
"@0xproject/utils": "^0.4.1",
"0x.js": "^0.33.6",
"@0xproject/subproviders": "^0.8.2",
"@0xproject/utils": "^0.4.3",
"body-parser": "^1.17.1",
"ethereumjs-tx": "^1.3.3",
"ethereumjs-util": "^5.1.1",
@@ -28,10 +28,10 @@
"web3-provider-engine": "^13.0.1"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/tslint-config": "^0.4.12",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.86",
"@types/lodash": "4.14.104",
"awesome-typescript-loader": "^3.1.3",
"gulp": "^3.9.1",
"nodemon": "^1.11.0",
@@ -41,7 +41,7 @@
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.0",
"web3-typescript-typings": "^0.10.2",
"webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0"
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/tslint-config",
"version": "0.4.10",
"version": "0.4.12",
"description": "Lint rules related to 0xProject for TSLint",
"main": "tslint.json",
"scripts": {
@@ -30,8 +30,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
"typescript": "2.7.1"
@@ -43,6 +43,6 @@
"tslint-react": "^3.2.0"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
# CHANGELOG
## v0.4.0 - _TBD, 2018_
## v0.4.0 - _March 18, 2018_
* Remove `JSONRPCPayload` (#426)
* Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/types",
"version": "0.3.1",
"version": "0.4.1",
"description": "0x types",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,8 +20,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
"tslint": "5.8.0",
@@ -30,9 +30,9 @@
"dependencies": {
"bignumber.js": "~4.1.0",
"web3": "^0.20.0",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.4.1 - _TBD, 2018_
## v0.4.3 - _March 18, 2018_
* Add `@types/node` to dependencies since `intervalUtils` has the `NodeJS` type as part of its public interface.
## v0.4.2 - _March 18, 2018_
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/utils",
"version": "0.4.1",
"version": "0.4.3",
"description": "0x TS utils",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,9 +20,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -30,16 +30,17 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.3.1",
"@0xproject/types": "^0.4.1",
"@types/node": "^8.0.53",
"bignumber.js": "~4.1.0",
"ethers-contracts": "^2.2.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"web3": "^0.20.0",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "web3-typescript-typings",
"version": "0.10.0",
"version": "0.10.2",
"description": "Typescript type definitions for web3",
"main": "index.d.ts",
"types": "index.d.ts",
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-typescript-typings#readme",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/monorepo-scripts": "^0.1.14",
"@types/bignumber.js": "^4.0.2",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
@@ -35,6 +35,6 @@
"bignumber.js": "~4.1.0"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
# CHANGELOG
## v0.3.0 _TBD, 2018_
## v0.3.0 _March 18, 2018_
* Add `web3Wrapper.takeSnapshotAsync`, `web3Wrapper.revertSnapshotAsync`, `web3Wrapper.mineBlockAsync`, `web3Wrapper.increaseTimeAsync` (#426)
* Add `web3Wrapper.isZeroExWeb3Wrapper` for runtime instanceOf checks (#426)

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/web3-wrapper",
"version": "0.2.1",
"version": "0.3.1",
"description": "Wraps around web3 and gives a nicer interface",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -32,9 +32,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@types/lodash": "^4.14.86",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -43,15 +43,15 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"ethers-contracts": "^2.2.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"lodash": "^4.17.4",
"web3": "^0.20.0",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
"version": "0.0.18",
"version": "0.0.22",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -18,12 +18,12 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.33.1",
"@0xproject/react-docs": "^0.0.1",
"@0xproject/react-shared": "^0.0.1",
"@0xproject/subproviders": "^0.7.0",
"@0xproject/web3-wrapper": "^0.2.1",
"@0xproject/utils": "^0.4.1",
"0x.js": "^0.33.6",
"@0xproject/react-docs": "^0.0.4",
"@0xproject/react-shared": "^0.0.4",
"@0xproject/subproviders": "^0.8.2",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
@@ -70,7 +70,7 @@
"@types/dateformat": "^1.0.1",
"@types/deep-equal": "^1.0.0",
"@types/jsonschema": "^1.1.1",
"@types/lodash": "^4.14.86",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/moment": "^2.13.0",
"@types/node": "^8.0.53",
@@ -87,7 +87,7 @@
"copy-webpack-plugin": "^4.0.1",
"copyfiles": "^1.2.0",
"css-loader": "0.23.x",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"exports-loader": "0.6.x",
"imports-loader": "0.6.x",
"json-loader": "^0.5.4",
@@ -99,7 +99,7 @@
"tslint": "5.8.0",
"tslint-config-0xproject": "^0.0.2",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.0",
"web3-typescript-typings": "^0.10.2",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

View File

@@ -108,6 +108,27 @@ const teamRow3: ProfileInfo[] = [
},
];
const teamRow4: ProfileInfo[] = [
{
name: 'Blake Henderson',
title: 'Operations Associate',
description: `Operations and Analytics. Previously analytics at LinkedIn. Economics at UC San Diego. `,
image: '/images/team/blake.jpg',
linkedIn: 'https://www.linkedin.com/in/blakerhenderson/',
github: '',
medium: '',
},
{
name: 'Zack Skelly',
title: 'Lead Recruiter',
description: `Talent. Previously first recruiter at Heap, recruiting at Dropbox and Google. English Rhetoric and Composition at Pepperdine.`,
image: '/images/team/zach.png',
linkedIn: 'https://www.linkedin.com/in/zackaryskelly/',
github: '',
medium: '',
},
];
const advisors: ProfileInfo[] = [
{
name: 'Fred Ehrsam',
@@ -200,6 +221,7 @@ export class About extends React.Component<AboutProps, AboutState> {
<div className="clearfix pb3">{this._renderProfiles(teamRow1)}</div>
<div className="clearfix">{this._renderProfiles(teamRow2)}</div>
<div className="clearfix">{this._renderProfiles(teamRow3)}</div>
<div className="clearfix">{this._renderProfiles(teamRow4)}</div>
</div>
<div className="pt3 pb2">
<div

View File

@@ -213,7 +213,7 @@
dependencies:
"@types/node" "*"
"@types/mocha@^2.2.42":
"@types/mocha@^2.2.42", "@types/mocha@^2.2.48":
version "2.2.48"
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
@@ -223,6 +223,12 @@
dependencies:
moment "*"
"@types/nock@^9.1.2":
version "9.1.2"
resolved "https://registry.yarnpkg.com/@types/nock/-/nock-9.1.2.tgz#0515b27e3f6bbc11834d22508ad02e2921dd376a"
dependencies:
"@types/node" "*"
"@types/node@*":
version "9.4.7"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.7.tgz#57d81cd98719df2c9de118f2d5f3b1120dcd7275"
@@ -367,6 +373,10 @@
version "10.0.2"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.2.tgz#cc4ea921877874d1261e2c44b89807bc836e1b12"
"@types/yargs@^11.0.0":
version "11.0.0"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.0.0.tgz#124b9ed9c65b7091cc36da59ae12cbd47d8745ea"
JSONStream@^1.0.4:
version "1.3.2"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
@@ -1987,6 +1997,12 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
chai-as-promised-typescript-typings@^0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/chai-as-promised-typescript-typings/-/chai-as-promised-typescript-typings-0.0.10.tgz#fad2fd48b1a1c1ad53ef7204fe9e3ffaa877d0e2"
dependencies:
chai-typescript-typings "^0.0.4"
chai-as-promised@^7.1.0:
version "7.1.1"
resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
@@ -1997,6 +2013,10 @@ chai-bignumber@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/chai-bignumber/-/chai-bignumber-2.0.2.tgz#de6c219c690b2d66b646ad6930096f9ba2199643"
chai-typescript-typings@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/chai-typescript-typings/-/chai-typescript-typings-0.0.4.tgz#f4d4057b4b1b89d9bd0e35862fc4761ae76cc94b"
chai@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
@@ -2005,7 +2025,7 @@ chai@^3.5.0:
deep-eql "^0.1.3"
type-detect "^1.0.0"
chai@^4.0.1:
chai@^4.0.1, chai@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
dependencies:
@@ -3092,7 +3112,7 @@ deep-eql@^3.0.0:
dependencies:
type-detect "^4.0.0"
deep-equal@^1.0.1, deep-equal@~1.0.1:
deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -7321,6 +7341,20 @@ nise@^1.2.0:
path-to-regexp "^1.7.0"
text-encoding "^0.6.4"
nock@^9.2.3:
version "9.2.3"
resolved "https://registry.yarnpkg.com/nock/-/nock-9.2.3.tgz#39738087d6a0497d3a165fb352612b38a2f9b92f"
dependencies:
chai "^4.1.2"
debug "^3.1.0"
deep-equal "^1.0.0"
json-stringify-safe "^5.0.1"
lodash "^4.17.5"
mkdirp "^0.5.0"
propagate "^1.0.0"
qs "^6.5.1"
semver "^5.5.0"
node-abi@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.3.0.tgz#f3d554d6ac72a9ee16f0f4dc9548db7c08de4986"
@@ -8573,6 +8607,10 @@ prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6,
loose-envify "^1.3.1"
object-assign "^4.1.1"
propagate@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/propagate/-/propagate-1.0.0.tgz#00c2daeedda20e87e3782b344adba1cddd6ad709"
property-is-enumerable-x@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/property-is-enumerable-x/-/property-is-enumerable-x-1.1.0.tgz#7ca48917476cd0914b37809bfd05776a0d942f6f"
@@ -8710,7 +8748,7 @@ q@^1.1.2, q@^1.4.1, q@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
qs@6.5.1, qs@~6.5.1:
qs@6.5.1, qs@^6.5.1, qs@~6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"