diff options
| author | Fred Carlsen <fred@sjelfull.no> | 2018-12-15 06:24:08 +0800 | 
|---|---|---|
| committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-15 06:24:08 +0800 | 
| commit | e53f28c5705ad6dc5afeb672ef7491c15a682018 (patch) | |
| tree | c8f946751f4fa88cfadbe621349f7f30b447e000 | |
| parent | 5c083ba16bb5db4e3b74035b73c0307b7f8db65e (diff) | |
| parent | 6d45beccad44e86ddd692d0cf54c09c29c5d9daf (diff) | |
| download | dexon-sol-tools-e53f28c5705ad6dc5afeb672ef7491c15a682018.tar.gz dexon-sol-tools-e53f28c5705ad6dc5afeb672ef7491c15a682018.tar.zst dexon-sol-tools-e53f28c5705ad6dc5afeb672ef7491c15a682018.zip | |
Merge remote-tracking branch 'upstream/development' into website
# Conflicts:
#	.gitignore
#	README.md
#	contracts/core/CHANGELOG.json
#	contracts/examples/package.json
#	contracts/extensions/package.json
#	contracts/interfaces/package.json
#	contracts/libs/package.json
#	contracts/multisig/package.json
#	contracts/protocol/CHANGELOG.json
#	contracts/protocol/DEPLOYS.json
#	contracts/protocol/package.json
#	contracts/test-utils/CHANGELOG.json
#	contracts/test-utils/CHANGELOG.md
#	contracts/test-utils/package.json
#	contracts/tokens/CHANGELOG.json
#	contracts/tokens/package.json
#	contracts/utils/package.json
#	packages/0x.js/CHANGELOG.json
#	packages/0x.js/CHANGELOG.md
#	packages/0x.js/package.json
#	packages/abi-gen-wrappers/CHANGELOG.json
#	packages/abi-gen-wrappers/CHANGELOG.md
#	packages/abi-gen-wrappers/package.json
#	packages/abi-gen/CHANGELOG.json
#	packages/abi-gen/CHANGELOG.md
#	packages/abi-gen/package.json
#	packages/assert/CHANGELOG.json
#	packages/assert/CHANGELOG.md
#	packages/assert/package.json
#	packages/asset-buyer/CHANGELOG.md
#	packages/asset-buyer/package.json
#	packages/base-contract/CHANGELOG.json
#	packages/base-contract/CHANGELOG.md
#	packages/base-contract/package.json
#	packages/connect/CHANGELOG.json
#	packages/connect/CHANGELOG.md
#	packages/connect/package.json
#	packages/contract-wrappers/CHANGELOG.json
#	packages/contract-wrappers/CHANGELOG.md
#	packages/contract-wrappers/package.json
#	packages/dev-tools-pages/package.json
#	packages/dev-utils/CHANGELOG.json
#	packages/dev-utils/CHANGELOG.md
#	packages/dev-utils/package.json
#	packages/ethereum-types/CHANGELOG.json
#	packages/ethereum-types/CHANGELOG.md
#	packages/ethereum-types/package.json
#	packages/fill-scenarios/CHANGELOG.json
#	packages/fill-scenarios/CHANGELOG.md
#	packages/fill-scenarios/package.json
#	packages/instant/package.json
#	packages/instant/src/types.ts
#	packages/json-schemas/CHANGELOG.json
#	packages/json-schemas/CHANGELOG.md
#	packages/json-schemas/package.json
#	packages/metacoin/package.json
#	packages/migrations/CHANGELOG.json
#	packages/migrations/CHANGELOG.md
#	packages/migrations/package.json
#	packages/order-utils/CHANGELOG.json
#	packages/order-utils/CHANGELOG.md
#	packages/order-utils/package.json
#	packages/order-watcher/CHANGELOG.json
#	packages/order-watcher/CHANGELOG.md
#	packages/order-watcher/package.json
#	packages/pipeline/package.json
#	packages/pipeline/src/ormconfig.ts
#	packages/pipeline/src/parsers/ddex_orders/index.ts
#	packages/pipeline/src/parsers/oasis_orders/index.ts
#	packages/pipeline/src/parsers/paradex_orders/index.ts
#	packages/pipeline/src/parsers/token_metadata/index.ts
#	packages/pipeline/src/scripts/pull_competing_dex_trades.ts
#	packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_missing_blocks.ts
#	packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_trusted_tokens.ts
#	packages/pipeline/src/scripts/update_relayer_info.ts
#	packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts
#	packages/pipeline/src/utils/index.ts
#	packages/pipeline/test/parsers/ddex_orders/index_test.ts
#	packages/pipeline/test/parsers/oasis_orders/index_test.ts
#	packages/pipeline/test/parsers/paradex_orders/index_test.ts
#	packages/react-docs/CHANGELOG.json
#	packages/react-docs/CHANGELOG.md
#	packages/react-docs/package.json
#	packages/react-shared/CHANGELOG.json
#	packages/react-shared/CHANGELOG.md
#	packages/react-shared/package.json
#	packages/sol-compiler/CHANGELOG.md
#	packages/sol-compiler/package.json
#	packages/sol-cov/CHANGELOG.json
#	packages/sol-cov/CHANGELOG.md
#	packages/sol-cov/package.json
#	packages/sol-doc/CHANGELOG.json
#	packages/sol-doc/CHANGELOG.md
#	packages/sol-doc/package.json
#	packages/sol-resolver/CHANGELOG.md
#	packages/sol-resolver/package.json
#	packages/sra-spec/CHANGELOG.json
#	packages/sra-spec/CHANGELOG.md
#	packages/sra-spec/package.json
#	packages/subproviders/CHANGELOG.json
#	packages/subproviders/CHANGELOG.md
#	packages/subproviders/package.json
#	packages/testnet-faucets/package.json
#	packages/types/CHANGELOG.md
#	packages/types/package.json
#	packages/typescript-typings/CHANGELOG.json
#	packages/typescript-typings/CHANGELOG.md
#	packages/typescript-typings/package.json
#	packages/utils/CHANGELOG.json
#	packages/utils/CHANGELOG.md
#	packages/utils/package.json
#	packages/web3-wrapper/CHANGELOG.json
#	packages/web3-wrapper/CHANGELOG.md
#	packages/web3-wrapper/package.json
#	packages/website/package.json
#	packages/website/public/index.html
#	packages/website/ts/pages/instant/fee_percentage_slider.tsx
#	yarn.lock
155 files changed, 1512 insertions, 1398 deletions
| diff --git a/.gitignore b/.gitignore index 27793d0e4..1d4410e25 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,6 @@ pids  *.seed  *.pid.lock -# OSX folder metadata -.DS_Store -  # SQLite database files  *.db  *.sqlite @@ -27,7 +27,7 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr  | Package                                          | Version                                                                                               | Description                                                                                       |  | ------------------------------------------------ | ----------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |  | [`0x-order-utils`](/python-packages/order_utils) | [](https://pypi.org/project/0x-order-utils/) | A set of utilities for generating, parsing, signing and validating 0x orders                      | -| [`0x-sra-client`](/python-packages/sra_client)   | [](https://pypi.org/project/0x-sra-client/)  | A Python client for interacting with servers conforming to the Standard Relayer API specification | +| [`0x-sra-client`](/python-packages/sra_client)   | [](https://pypi.org/project/0x-sra-client/)   | A Python client for interacting with servers conforming to the Standard Relayer API specification |  ### Typescript/Javascript Packages diff --git a/contracts/examples/CHANGELOG.json b/contracts/examples/CHANGELOG.json new file mode 100644 index 000000000..19ac770af --- /dev/null +++ b/contracts/examples/CHANGELOG.json @@ -0,0 +1,11 @@ +[ +    { +        "timestamp": 1544741676, +        "version": "1.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ] +    } +] diff --git a/contracts/examples/CHANGELOG.md b/contracts/examples/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/examples/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/examples/package.json b/contracts/examples/package.json index bb20fd212..77846241e 100644 --- a/contracts/examples/package.json +++ b/contracts/examples/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-examples", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -33,13 +32,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "@types/node": "*", @@ -60,20 +59,20 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-interfaces": "^1.0.1", -        "@0x/contracts-libs": "^1.0.1", -        "@0x/contracts-multisig": "^1.0.1", -        "@0x/contracts-tokens": "^1.0.1", -        "@0x/contracts-utils": "^1.0.1", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-interfaces": "^1.0.2", +        "@0x/contracts-libs": "^1.0.2", +        "@0x/contracts-multisig": "^1.0.2", +        "@0x/contracts-tokens": "^1.0.2", +        "@0x/contracts-utils": "^1.0.2", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/js-combinatorics": "^0.5.29",          "bn.js": "^4.11.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5"      }, diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json new file mode 100644 index 000000000..19ac770af --- /dev/null +++ b/contracts/extensions/CHANGELOG.json @@ -0,0 +1,11 @@ +[ +    { +        "timestamp": 1544741676, +        "version": "1.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ] +    } +] diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/extensions/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/extensions/DEPLOYS.json b/contracts/extensions/DEPLOYS.json new file mode 100644 index 000000000..1a093bf77 --- /dev/null +++ b/contracts/extensions/DEPLOYS.json @@ -0,0 +1,31 @@ +[ +    { +        "name": "Forwarder", +        "version": "1.1.0", +        "changes": [ +            { +                "note": "Round up when calculating remaining amounts in marketBuy functions", +                "pr": 1162, +                "networks": { +                    "1": "0x5468a1dc173652ee28d249c271fa9933144746b1", +                    "3": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e", +                    "42": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6" +                } +            } +        ] +    }, +    { +        "name": "Forwarder", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "protocol v2 deploy", +                "networks": { +                    "1": "0x7afc2d5107af94c462a194d2c21b5bdd238709d6", +                    "3": "0x3983e204b12b3c02fb0638caf2cd406a62e0ead3", +                    "42": "0xd85e2fa7e7e252b27b01bf0d65c946959d2f45b8" +                } +            } +        ] +    } +] diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index e359f1e4d..938e1138c 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-extensions", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -44,13 +43,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "@types/node": "*", @@ -71,20 +70,20 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-interfaces": "^1.0.1", -        "@0x/contracts-libs": "^1.0.1", -        "@0x/contracts-protocol": "^2.1.57", -        "@0x/contracts-tokens": "^1.0.1", -        "@0x/contracts-utils": "^1.0.1", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-interfaces": "^1.0.2", +        "@0x/contracts-libs": "^1.0.2", +        "@0x/contracts-protocol": "^2.1.59", +        "@0x/contracts-tokens": "^1.0.2", +        "@0x/contracts-utils": "^1.0.2", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/js-combinatorics": "^0.5.29",          "bn.js": "^4.11.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5"      }, diff --git a/contracts/interfaces/CHANGELOG.json b/contracts/interfaces/CHANGELOG.json new file mode 100644 index 000000000..19ac770af --- /dev/null +++ b/contracts/interfaces/CHANGELOG.json @@ -0,0 +1,11 @@ +[ +    { +        "timestamp": 1544741676, +        "version": "1.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ] +    } +] diff --git a/contracts/interfaces/CHANGELOG.md b/contracts/interfaces/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/interfaces/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/interfaces/package.json b/contracts/interfaces/package.json index 85d0ccc26..4d3e4b7f9 100644 --- a/contracts/interfaces/package.json +++ b/contracts/interfaces/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-interfaces", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -30,9 +29,9 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/interfaces/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/tslint-config": "^2.0.0",          "npm-run-all": "^4.1.2",          "shx": "^0.2.2",          "solhint": "^1.4.1", @@ -41,14 +40,14 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-libs": "^1.0.1", -        "@0x/contracts-utils": "^1.0.1", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-libs": "^1.0.2", +        "@0x/contracts-utils": "^1.0.2", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "lodash": "^4.17.5"      },      "publishConfig": { diff --git a/contracts/libs/CHANGELOG.json b/contracts/libs/CHANGELOG.json new file mode 100644 index 000000000..19ac770af --- /dev/null +++ b/contracts/libs/CHANGELOG.json @@ -0,0 +1,11 @@ +[ +    { +        "timestamp": 1544741676, +        "version": "1.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ] +    } +] diff --git a/contracts/libs/CHANGELOG.md b/contracts/libs/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/libs/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/libs/package.json b/contracts/libs/package.json index 5d061774f..fa4b6e523 100644 --- a/contracts/libs/package.json +++ b/contracts/libs/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-libs", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -44,13 +43,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "@types/node": "*", @@ -71,17 +70,17 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-multisig": "^1.0.1", -        "@0x/contracts-utils": "^1.0.1", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-multisig": "^1.0.2", +        "@0x/contracts-utils": "^1.0.2", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/js-combinatorics": "^0.5.29",          "bn.js": "^4.11.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5"      }, diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index fe51488c7..19ac770af 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1 +1,11 @@ -[] +[ +    { +        "timestamp": 1544741676, +        "version": "1.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ] +    } +] diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/multisig/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 84285aec3..b338f67f7 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-multisig", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -44,13 +43,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/ethereumjs-abi": "^0.6.0",          "@types/lodash": "4.14.104", @@ -71,13 +70,13 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/base-contract": "^3.0.10", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "lodash": "^4.17.5"      },      "publishConfig": { diff --git a/contracts/protocol/CHANGELOG.json b/contracts/protocol/CHANGELOG.json index 371f18cd4..5c3798a69 100644 --- a/contracts/protocol/CHANGELOG.json +++ b/contracts/protocol/CHANGELOG.json @@ -1,120 +1,10 @@  [      { -        "name": "MultiAssetProxy", -        "version": "1.0.0", +        "timestamp": 1544741676, +        "version": "2.1.59",          "changes": [              { -                "note": "Add MultiAssetProxy implementation", -                "pr": 1224 -            } -        ] -    }, -    { -        "name": "OrderValidator", -        "version": "1.0.1", -        "changes": [ -            { -                "note": "remove `getApproved` check from ERC721 approval query", -                "pr": 1149 -            } -        ] -    }, -    { -        "name": "Forwarder", -        "version": "1.1.0", -        "changes": [ -            { -                "note": "Round up when calculating remaining amounts in marketBuy functions", -                "pr": 1162, -                "networks": { -                    "1": "0x5468a1dc173652ee28d249c271fa9933144746b1", -                    "3": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e", -                    "42": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6" -                } -            } -        ] -    }, -    { -        "name": "Forwarder", -        "version": "1.0.0", -        "changes": [ -            { -                "note": "protocol v2 deploy", -                "networks": { -                    "1": "0x7afc2d5107af94c462a194d2c21b5bdd238709d6", -                    "3": "0x3983e204b12b3c02fb0638caf2cd406a62e0ead3", -                    "42": "0xd85e2fa7e7e252b27b01bf0d65c946959d2f45b8" -                } -            } -        ] -    }, -    { -        "name": "OrderValidator", -        "version": "1.0.0", -        "changes": [ -            { -                "note": "protocol v2 deploy", -                "networks": { -                    "1": "0x9463e518dea6810309563c81d5266c1b1d149138", -                    "3": "0x90431a90516ab49af23a0530e04e8c7836e7122f", -                    "42": "0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d" -                } -            } -        ] -    }, -    { -        "name": "Exchange", -        "version": "2.0.0", -        "changes": [ -            { -                "note": "protocol v2 deploy", -                "networks": { -                    "1": "0x4f833a24e1f95d70f028921e27040ca56e09ab0b", -                    "3": "0x4530c0483a1633c7a1c97d2c53721caff2caaaaf", -                    "42": "0x35dd2932454449b14cee11a94d3674a936d5d7b2" -                } -            } -        ] -    }, -    { -        "name": "ERC20Proxy", -        "version": "1.0.0", -        "changes": [ -            { -                "note": "protocol v2 deploy", -                "networks": { -                    "1": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e", -                    "3": "0xb1408f4c245a23c31b98d2c626777d4c0d766caa", -                    "42": "0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e" -                } -            } -        ] -    }, -    { -        "name": "ERC721Proxy", -        "version": "1.0.0", -        "changes": [ -            { -                "note": "protocol v2 deploy", -                "networks": { -                    "1": "0x208e41fb445f1bb1b6780d58356e81405f3e6127", -                    "3": "0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4", -                    "42": "0x2a9127c745688a165106c11cd4d647d2220af821" -                } -            } -        ] -    }, -    { -        "name": "AssetProxyOwner", -        "version": "1.0.0", -        "changes": [ -            { -                "note": "protocol v2 deploy", -                "networks": { -                    "1": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6", -                    "3": "0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b", -                    "42": "0x2c824d2882baa668e0d5202b1e7f2922278703f8" -                } +                "note": "Dependencies updated"              }          ]      } diff --git a/contracts/protocol/CHANGELOG.md b/contracts/protocol/CHANGELOG.md new file mode 100644 index 000000000..d90b1b2cc --- /dev/null +++ b/contracts/protocol/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v2.1.59 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/protocol/DEPLOYS.json b/contracts/protocol/DEPLOYS.json new file mode 100644 index 000000000..5c24ae59c --- /dev/null +++ b/contracts/protocol/DEPLOYS.json @@ -0,0 +1,92 @@ +[ +    { +        "name": "MultiAssetProxy", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "Add MultiAssetProxy implementation", +                "pr": 1224 +            } +        ] +    }, +    { +        "name": "OrderValidator", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "remove `getApproved` check from ERC721 approval query", +                "pr": 1149 +            } +        ] +    }, +    { +        "name": "OrderValidator", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "protocol v2 deploy", +                "networks": { +                    "1": "0x9463e518dea6810309563c81d5266c1b1d149138", +                    "3": "0x90431a90516ab49af23a0530e04e8c7836e7122f", +                    "42": "0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d" +                } +            } +        ] +    }, +    { +        "name": "Exchange", +        "version": "2.0.0", +        "changes": [ +            { +                "note": "protocol v2 deploy", +                "networks": { +                    "1": "0x4f833a24e1f95d70f028921e27040ca56e09ab0b", +                    "3": "0x4530c0483a1633c7a1c97d2c53721caff2caaaaf", +                    "42": "0x35dd2932454449b14cee11a94d3674a936d5d7b2" +                } +            } +        ] +    }, +    { +        "name": "ERC20Proxy", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "protocol v2 deploy", +                "networks": { +                    "1": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e", +                    "3": "0xb1408f4c245a23c31b98d2c626777d4c0d766caa", +                    "42": "0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e" +                } +            } +        ] +    }, +    { +        "name": "ERC721Proxy", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "protocol v2 deploy", +                "networks": { +                    "1": "0x208e41fb445f1bb1b6780d58356e81405f3e6127", +                    "3": "0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4", +                    "42": "0x2a9127c745688a165106c11cd4d647d2220af821" +                } +            } +        ] +    }, +    { +        "name": "AssetProxyOwner", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "protocol v2 deploy", +                "networks": { +                    "1": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6", +                    "3": "0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b", +                    "42": "0x2c824d2882baa668e0d5202b1e7f2922278703f8" +                } +            } +        ] +    } +] diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json index 1442db51e..838189371 100644 --- a/contracts/protocol/package.json +++ b/contracts/protocol/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-protocol", -    "version": "2.1.57", +    "version": "2.1.59",      "engines": {          "node": ">=6.12"      }, @@ -44,13 +43,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "@types/node": "*", @@ -71,21 +70,21 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-examples": "^1.0.1", -        "@0x/contracts-interfaces": "^1.0.1", -        "@0x/contracts-libs": "^1.0.1", -        "@0x/contracts-multisig": "^1.0.1", -        "@0x/contracts-tokens": "^1.0.1", -        "@0x/contracts-utils": "^1.0.1", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-examples": "^1.0.2", +        "@0x/contracts-interfaces": "^1.0.2", +        "@0x/contracts-libs": "^1.0.2", +        "@0x/contracts-multisig": "^1.0.2", +        "@0x/contracts-tokens": "^1.0.2", +        "@0x/contracts-utils": "^1.0.2", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/js-combinatorics": "^0.5.29",          "bn.js": "^4.11.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5"      }, diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 267fdcc61..6e4682b7e 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,11 +1,11 @@  [      { -        "version": "1.0.1", +        "version": "1.0.2",          "changes": [              {                  "note": "Dependencies updated"              }          ], -        "timestamp": 1544570656 +        "timestamp": 1544739608      }  ] diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md index 22b7fb109..716353d05 100644 --- a/contracts/test-utils/CHANGELOG.md +++ b/contracts/test-utils/CHANGELOG.md @@ -5,6 +5,6 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG -## v1.0.1 - _December 11, 2018_ +## v1.0.2 - _December 13, 2018_      * Dependencies updated diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index c15ee92ad..18ec8f6a8 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/contracts-test-utils", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -40,17 +40,17 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/dev-utils": "^1.0.20", -        "@0x/order-utils": "^3.0.6", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/abi-gen": "^1.0.19", +        "@0x/dev-utils": "^1.0.21", +        "@0x/order-utils": "^3.0.7", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/bn.js": "^4.11.0",          "@types/ethereumjs-abi": "^0.6.0",          "@types/js-combinatorics": "^0.5.29", @@ -61,7 +61,7 @@          "chai-as-promised": "^7.1.0",          "chai-bignumber": "^2.0.1",          "dirty-chai": "^2.0.1", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-abi": "0.6.5",          "ethereumjs-util": "^5.1.1",          "ethers": "~4.0.4", diff --git a/contracts/test-utils/src/assertions.ts b/contracts/test-utils/src/assertions.ts index b1dec1281..f31651f4d 100644 --- a/contracts/test-utils/src/assertions.ts +++ b/contracts/test-utils/src/assertions.ts @@ -23,7 +23,7 @@ export type sendTransactionResult = Promise<TransactionReceipt | TransactionRece   * @returns either the given ganacheError or gethError depending on the backing   * node.   */ -async function _getGanacheOrGethError(ganacheError: string, gethError: string): Promise<string> { +async function _getGanacheOrGethErrorAsync(ganacheError: string, gethError: string): Promise<string> {      if (_.isUndefined(nodeType)) {          nodeType = await web3Wrapper.getNodeTypeAsync();      } @@ -38,15 +38,15 @@ async function _getGanacheOrGethError(ganacheError: string, gethError: string):  }  async function _getInsufficientFundsErrorMessageAsync(): Promise<string> { -    return _getGanacheOrGethError("sender doesn't have enough funds", 'insufficient funds'); +    return _getGanacheOrGethErrorAsync("sender doesn't have enough funds", 'insufficient funds');  }  async function _getTransactionFailedErrorMessageAsync(): Promise<string> { -    return _getGanacheOrGethError('revert', 'always failing transaction'); +    return _getGanacheOrGethErrorAsync('revert', 'always failing transaction');  }  async function _getContractCallFailedErrorMessageAsync(): Promise<string> { -    return _getGanacheOrGethError('revert', 'Contract call failed'); +    return _getGanacheOrGethErrorAsync('revert', 'Contract call failed');  }  /** @@ -54,7 +54,7 @@ async function _getContractCallFailedErrorMessageAsync(): Promise<string> {   * contract call. The exact error message depends on the backing Ethereum node.   */  export async function getInvalidOpcodeErrorMessageForCallAsync(): Promise<string> { -    return _getGanacheOrGethError('invalid opcode', 'Contract call failed'); +    return _getGanacheOrGethErrorAsync('invalid opcode', 'Contract call failed');  }  /** @@ -65,7 +65,7 @@ export async function getInvalidOpcodeErrorMessageForCallAsync(): Promise<string   * @returns the expected error message.   */  export async function getRevertReasonOrErrorMessageForSendTransactionAsync(reason: RevertReason): Promise<string> { -    return _getGanacheOrGethError(reason, 'always failing transaction'); +    return _getGanacheOrGethErrorAsync(reason, 'always failing transaction');  }  /** diff --git a/contracts/test-utils/src/test_with_reference.ts b/contracts/test-utils/src/test_with_reference.ts index b80be4a6c..75d15b0aa 100644 --- a/contracts/test-utils/src/test_with_reference.ts +++ b/contracts/test-utils/src/test_with_reference.ts @@ -26,7 +26,7 @@ type PromiseResult<T> = Value<T> | ErrorMessage;  // TODO(albrow): This seems like a generic utility function that could exist in  // lodash. We should replace it by a library implementation, or move it to our  // own. -async function evaluatePromise<T>(promise: Promise<T>): Promise<PromiseResult<T>> { +async function evaluatePromiseAsync<T>(promise: Promise<T>): Promise<PromiseResult<T>> {      try {          return new Value<T>(await promise);      } catch (e) { @@ -93,10 +93,10 @@ export async function testWithReferenceFuncAsync(      values: any[],  ): Promise<void> {      // Measure correct behaviour -    const expected = await evaluatePromise(referenceFuncAsync(...values)); +    const expected = await evaluatePromiseAsync(referenceFuncAsync(...values));      // Measure actual behaviour -    const actual = await evaluatePromise(testFuncAsync(...values)); +    const actual = await evaluatePromiseAsync(testFuncAsync(...values));      // Compare behaviour      if (expected instanceof ErrorMessage) { diff --git a/contracts/tokens/CHANGELOG.json b/contracts/tokens/CHANGELOG.json index 5ff58c035..19ac770af 100644 --- a/contracts/tokens/CHANGELOG.json +++ b/contracts/tokens/CHANGELOG.json @@ -1,15 +1,10 @@  [      { -        "name": "ZRXToken", -        "version": "1.0.0", +        "timestamp": 1544741676, +        "version": "1.0.2",          "changes": [              { -                "note": "protocol v1 deploy", -                "networks": { -                    "1": "0xe41d2489571d322189246dafa5ebde1f4699f498", -                    "3": "0xff67881f8d12f372d91baae9752eb3631ff0ed00", -                    "42": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa" -                } +                "note": "Dependencies updated"              }          ]      } diff --git a/contracts/tokens/CHANGELOG.md b/contracts/tokens/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/tokens/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/tokens/DEPLOYS.json b/contracts/tokens/DEPLOYS.json new file mode 100644 index 000000000..5ff58c035 --- /dev/null +++ b/contracts/tokens/DEPLOYS.json @@ -0,0 +1,16 @@ +[ +    { +        "name": "ZRXToken", +        "version": "1.0.0", +        "changes": [ +            { +                "note": "protocol v1 deploy", +                "networks": { +                    "1": "0xe41d2489571d322189246dafa5ebde1f4699f498", +                    "3": "0xff67881f8d12f372d91baae9752eb3631ff0ed00", +                    "42": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa" +                } +            } +        ] +    } +] diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json index 6c932a891..6f8a366dd 100644 --- a/contracts/tokens/package.json +++ b/contracts/tokens/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-tokens", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -44,13 +43,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "@types/node": "*", @@ -71,19 +70,19 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-interfaces": "^1.0.1", -        "@0x/contracts-libs": "^1.0.1", -        "@0x/contracts-multisig": "^1.0.1", -        "@0x/contracts-utils": "^1.0.1", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-interfaces": "^1.0.2", +        "@0x/contracts-libs": "^1.0.2", +        "@0x/contracts-multisig": "^1.0.2", +        "@0x/contracts-utils": "^1.0.2", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/js-combinatorics": "^0.5.29",          "bn.js": "^4.11.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5"      }, diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json new file mode 100644 index 000000000..19ac770af --- /dev/null +++ b/contracts/utils/CHANGELOG.json @@ -0,0 +1,11 @@ +[ +    { +        "timestamp": 1544741676, +        "version": "1.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ] +    } +] diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/utils/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + +    * Dependencies updated diff --git a/contracts/utils/package.json b/contracts/utils/package.json index e8a2a7710..a776bdfbb 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -1,7 +1,6 @@  { -    "private": true,      "name": "@0x/contracts-utils", -    "version": "1.0.1", +    "version": "1.0.2",      "engines": {          "node": ">=6.12"      }, @@ -44,13 +43,13 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", -        "@0x/contracts-test-utils": "^1.0.1", -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/abi-gen": "^1.0.19", +        "@0x/contracts-test-utils": "^1.0.2", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "@types/node": "*", @@ -72,14 +71,14 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9", -        "@0x/contracts-multisig": "^1.0.1", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/base-contract": "^3.0.10", +        "@0x/contracts-multisig": "^1.0.2", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5"      }, diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 096b29c78..32351ad82 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.0.8", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.0.7",          "changes": [              { diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 226b4919a..2923fdf03 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.0.8 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.0.7 - _December 11, 2018_      * Dependencies updated diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index fa1c61131..2960c9e4b 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@  {      "name": "0x.js", -    "version": "2.0.7", +    "version": "2.0.8",      "engines": {          "node": ">=6.12"      }, @@ -42,11 +42,11 @@      },      "license": "Apache-2.0",      "devDependencies": { -        "@0x/abi-gen-wrappers": "^2.0.1", +        "@0x/abi-gen-wrappers": "^2.0.2",          "@0x/contract-addresses": "^2.0.0", -        "@0x/dev-utils": "^1.0.20", -        "@0x/migrations": "^2.2.1", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/migrations": "^2.2.2", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42",          "@types/node": "*", @@ -72,18 +72,18 @@          "webpack": "^4.20.2"      },      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/base-contract": "^3.0.9", -        "@0x/contract-wrappers": "^4.1.2", -        "@0x/order-utils": "^3.0.6", -        "@0x/order-watcher": "^2.2.7", -        "@0x/subproviders": "^2.1.7", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/assert": "^1.0.20", +        "@0x/base-contract": "^3.0.10", +        "@0x/contract-wrappers": "^4.1.3", +        "@0x/order-utils": "^3.0.7", +        "@0x/order-watcher": "^2.2.8", +        "@0x/subproviders": "^2.1.8", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/web3-provider-engine": "^14.0.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethers": "~4.0.4",          "lodash": "^4.17.5",          "web3-provider-engine": "14.0.6" diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json index 41e35b712..d46e828f4 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.json +++ b/packages/abi-gen-wrappers/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.0.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.0.1",          "changes": [              { diff --git a/packages/abi-gen-wrappers/CHANGELOG.md b/packages/abi-gen-wrappers/CHANGELOG.md index 1209a059b..c13c7a60f 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.md +++ b/packages/abi-gen-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.0.2 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.0.1 - _December 11, 2018_      * Dependencies updated diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json index e40a19615..25ba3a6e0 100644 --- a/packages/abi-gen-wrappers/package.json +++ b/packages/abi-gen-wrappers/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/abi-gen-wrappers", -    "version": "2.0.1", +    "version": "2.0.2",      "engines": {          "node": ">=6.12"      }, @@ -30,19 +30,19 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",      "devDependencies": { -        "@0x/abi-gen": "^1.0.18", +        "@0x/abi-gen": "^1.0.19",          "@0x/abi-gen-templates": "^1.0.1", -        "@0x/tslint-config": "^1.0.10", -        "@0x/types": "^1.4.0", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/tslint-config": "^2.0.0", +        "@0x/types": "^1.4.1", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "ethers": "~4.0.4",          "lodash": "^4.17.5",          "shx": "^0.2.2"      },      "dependencies": { -        "@0x/base-contract": "^3.0.9" +        "@0x/base-contract": "^3.0.10"      },      "publishConfig": {          "access": "public" diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 9142d86d0..253fb124d 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.19", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.18",          "changes": [              { diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md index 4edc82bd3..4ca19ad7e 100644 --- a/packages/abi-gen/CHANGELOG.md +++ b/packages/abi-gen/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.19 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.18 - _December 11, 2018_      * Dependencies updated diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 8f46eaca0..b122c742d 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/abi-gen", -    "version": "1.0.18", +    "version": "1.0.19",      "engines": {          "node": ">=6.12"      }, @@ -31,10 +31,10 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",      "dependencies": { -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8",          "chalk": "^2.3.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "glob": "^7.1.2",          "handlebars": "^4.0.11",          "lodash": "^4.17.5", @@ -45,7 +45,7 @@          "yargs": "^10.0.3"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/glob": "5.0.35",          "@types/handlebars": "^4.0.36",          "@types/mkdirp": "^0.5.1", diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index bedde7738..3805a044f 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.20", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.19",          "changes": [              { diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md index bef49229b..ef84c48d4 100644 --- a/packages/assert/CHANGELOG.md +++ b/packages/assert/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.20 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.19 - _December 11, 2018_      * Dependencies updated diff --git a/packages/assert/package.json b/packages/assert/package.json index 2792c066f..cec1748cd 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/assert", -    "version": "1.0.19", +    "version": "1.0.20",      "engines": {          "node": ">=6.12"      }, @@ -29,7 +29,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42",          "@types/valid-url": "^1.0.2", @@ -44,9 +44,9 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/json-schemas": "^2.1.3", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", +        "@0x/json-schemas": "^2.1.4", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8",          "lodash": "^4.17.5",          "valid-url": "^1.0.9"      }, diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index 1a304f4a3..470d9b03b 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "3.0.4", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "3.0.3",          "changes": [              { diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md index cc64f295b..cadb1acf8 100644 --- a/packages/asset-buyer/CHANGELOG.md +++ b/packages/asset-buyer/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v3.0.4 - _December 13, 2018_ + +    * Dependencies updated +  ## v3.0.3 - _December 11, 2018_      * Update SRA order provider to include Dai diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index 54e652361..401aec120 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/asset-buyer", -    "version": "3.0.3", +    "version": "3.0.4",      "engines": {          "node": ">=6.12"      }, @@ -36,21 +36,21 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/connect": "^3.0.9", -        "@0x/contract-wrappers": "^4.1.2", -        "@0x/json-schemas": "^2.1.3", -        "@0x/order-utils": "^3.0.6", -        "@0x/subproviders": "^2.1.7", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/assert": "^1.0.20", +        "@0x/connect": "^3.0.10", +        "@0x/contract-wrappers": "^4.1.3", +        "@0x/json-schemas": "^2.1.4", +        "@0x/order-utils": "^3.0.7", +        "@0x/subproviders": "^2.1.8", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "lodash": "^4.17.5"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "^4.14.116",          "@types/mocha": "^2.2.42",          "@types/node": "*", diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index fc3f065d9..a4cd17d42 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "3.0.10", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "3.0.9",          "changes": [              { diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md index 65888d9ab..a8ce346d7 100644 --- a/packages/base-contract/CHANGELOG.md +++ b/packages/base-contract/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v3.0.10 - _December 13, 2018_ + +    * Dependencies updated +  ## v3.0.9 - _December 11, 2018_      * Dependencies updated diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 17c2af2dd..87d70dd5f 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/base-contract", -    "version": "3.0.9", +    "version": "3.0.10",      "engines": {          "node": ">=6.12"      }, @@ -29,7 +29,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "4.14.104",          "chai": "^4.0.1",          "make-promises-safe": "^1.1.0", @@ -40,10 +40,10 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "ethers": "~4.0.4",          "lodash": "^4.17.5"      }, diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index f9d0f51cc..e5bde40ae 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "3.0.10", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "3.0.9",          "changes": [              { diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index befd0572c..a5f95b988 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v3.0.10 - _December 13, 2018_ + +    * Dependencies updated +  ## v3.0.9 - _December 11, 2018_      * Dependencies updated diff --git a/packages/connect/package.json b/packages/connect/package.json index 9d1218b5a..4985d0410 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/connect", -    "version": "3.0.9", +    "version": "3.0.10",      "engines": {          "node": ">=6.12"      }, @@ -44,12 +44,12 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/json-schemas": "^2.1.3", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", +        "@0x/assert": "^1.0.20", +        "@0x/json-schemas": "^2.1.4", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8",          "lodash": "^4.17.5",          "query-string": "^5.0.1",          "sinon": "^4.0.0", @@ -57,7 +57,7 @@          "websocket": "^1.0.25"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/fetch-mock": "^6.0.3",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42", diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index e0f5c8ded..9475e5a88 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "4.1.3", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "4.1.2",          "changes": [              { diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md index 3716db927..595fbcc31 100644 --- a/packages/contract-wrappers/CHANGELOG.md +++ b/packages/contract-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v4.1.3 - _December 13, 2018_ + +    * Dependencies updated +  ## v4.1.2 - _December 11, 2018_      * Dependencies updated diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index ec0dcb0cb..f3f7301fd 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/contract-wrappers", -    "version": "4.1.2", +    "version": "4.1.3",      "description": "Smart TS wrappers for 0x smart contracts",      "keywords": [          "0xproject", @@ -37,10 +37,10 @@          "node": ">=6.0.0"      },      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/migrations": "^2.2.1", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/migrations": "^2.2.2", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42",          "@types/node": "*", @@ -65,18 +65,18 @@          "web3-provider-engine": "14.0.6"      },      "dependencies": { -        "@0x/abi-gen-wrappers": "^2.0.1", -        "@0x/assert": "^1.0.19", +        "@0x/abi-gen-wrappers": "^2.0.2", +        "@0x/assert": "^1.0.20",          "@0x/contract-addresses": "^2.0.0",          "@0x/contract-artifacts": "^1.1.2", -        "@0x/fill-scenarios": "^1.0.15", -        "@0x/json-schemas": "^2.1.3", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/fill-scenarios": "^1.0.16", +        "@0x/json-schemas": "^2.1.4", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "ethereumjs-blockstream": "6.0.0",          "ethereumjs-util": "^5.1.1",          "ethers": "~4.0.4", diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index f83b57308..754db3208 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/dev-tools-pages", -    "version": "0.0.9", +    "version": "0.0.10",      "engines": {          "node": ">=6.12"      }, @@ -16,7 +16,7 @@      },      "license": "Apache-2.0",      "dependencies": { -        "@0x/react-shared": "^1.0.24", +        "@0x/react-shared": "^1.0.25",          "basscss": "^8.0.3",          "bowser": "^1.9.3",          "less": "^2.7.2", diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 940a59ea6..b6cc74ce7 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.21", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.20",          "changes": [              { diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index f2484854b..9a55e4e58 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.21 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.20 - _December 11, 2018_      * Dependencies updated diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 872a285a3..a3eb4651a 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/dev-utils", -    "version": "1.0.20", +    "version": "1.0.21",      "engines": {          "node": ">=6.12"      }, @@ -29,7 +29,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42",          "make-promises-safe": "^1.1.0", @@ -41,14 +41,14 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/subproviders": "^2.1.7", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/subproviders": "^2.1.8", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/web3-provider-engine": "^14.0.0",          "chai": "^4.0.1", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "lodash": "^4.17.5"      },      "publishConfig": { diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json index 6ce8feb1e..9a0f2ad49 100644 --- a/packages/ethereum-types/CHANGELOG.json +++ b/packages/ethereum-types/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.1.4", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.1.3",          "changes": [              { diff --git a/packages/ethereum-types/CHANGELOG.md b/packages/ethereum-types/CHANGELOG.md index 07cf8e042..1d27757f3 100644 --- a/packages/ethereum-types/CHANGELOG.md +++ b/packages/ethereum-types/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.1.4 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.1.3 - _December 11, 2018_      * Dependencies updated diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json index 473f9119c..69ae64c2b 100644 --- a/packages/ethereum-types/package.json +++ b/packages/ethereum-types/package.json @@ -1,6 +1,6 @@  {      "name": "ethereum-types", -    "version": "1.1.3", +    "version": "1.1.4",      "engines": {          "node": ">=6.12"      }, @@ -29,7 +29,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "make-promises-safe": "^1.1.0",          "shx": "^0.2.2",          "tslint": "5.11.0", diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index af44a13d5..ca256399a 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.16", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.15",          "changes": [              { diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md index f85f5ceed..e9b88547d 100644 --- a/packages/fill-scenarios/CHANGELOG.md +++ b/packages/fill-scenarios/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.16 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.15 - _December 11, 2018_      * Dependencies updated diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 10f8b0495..7a9d21e0a 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/fill-scenarios", -    "version": "1.0.15", +    "version": "1.0.16",      "description": "0x order fill scenario generator",      "main": "lib/index.js",      "types": "lib/index.d.ts", @@ -20,7 +20,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/lodash": "4.14.104",          "make-promises-safe": "^1.1.0",          "shx": "^0.2.2", @@ -28,15 +28,15 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/abi-gen-wrappers": "^2.0.1", -        "@0x/base-contract": "^3.0.9", +        "@0x/abi-gen-wrappers": "^2.0.2", +        "@0x/base-contract": "^3.0.10",          "@0x/contract-artifacts": "^1.1.2", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", -        "ethereum-types": "^1.1.3", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1", +        "ethereum-types": "^1.1.4",          "ethers": "~4.0.4",          "lodash": "^4.17.5"      }, diff --git a/packages/instant/package.json b/packages/instant/package.json index 7a519f460..0a5e152ca 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/instant", -    "version": "1.0.3", +    "version": "1.0.4",      "engines": {          "node": ">=6.12"      }, @@ -41,18 +41,18 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/asset-buyer": "^3.0.3", -        "@0x/json-schemas": "^2.1.3", -        "@0x/order-utils": "^3.0.6", -        "@0x/subproviders": "^2.1.7", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/assert": "^1.0.20", +        "@0x/asset-buyer": "^3.0.4", +        "@0x/json-schemas": "^2.1.4", +        "@0x/order-utils": "^3.0.7", +        "@0x/subproviders": "^2.1.8", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "bowser": "^1.9.4",          "copy-to-clipboard": "^3.0.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "lodash": "^4.17.5",          "polished": "^2.2.0",          "react": "^16.5.2", @@ -65,7 +65,7 @@          "ts-optchain": "^0.1.1"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@static/discharge": "https://github.com/0xProject/discharge.git",          "@types/enzyme": "^3.1.14",          "@types/enzyme-adapter-react-16": "^1.0.3", diff --git a/packages/instant/src/components/scaling_amount_input.tsx b/packages/instant/src/components/scaling_amount_input.tsx index 86aca5a65..4feb0502d 100644 --- a/packages/instant/src/components/scaling_amount_input.tsx +++ b/packages/instant/src/components/scaling_amount_input.tsx @@ -58,6 +58,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps,          const { textLengthThreshold, fontColor, maxFontSizePx, onFontSizeChange } = this.props;          return (              <ScalingInput +                type="number"                  maxFontSizePx={maxFontSizePx}                  textLengthThreshold={textLengthThreshold}                  onFontSizeChange={onFontSizeChange} diff --git a/packages/instant/src/components/scaling_input.tsx b/packages/instant/src/components/scaling_input.tsx index 791692257..00aea37da 100644 --- a/packages/instant/src/components/scaling_input.tsx +++ b/packages/instant/src/components/scaling_input.tsx @@ -1,3 +1,4 @@ +import { ObjectMap } from '@0x/types';  import * as _ from 'lodash';  import * as React from 'react'; @@ -13,10 +14,15 @@ export enum ScalingInputPhase {  export interface ScalingSettings {      percentageToReduceFontSizePerCharacter: number; -    constantPxToIncreaseWidthPerCharacter: number; +    // 1ch = the width of the 0 chararacter. +    // Allow to customize 'char' length for different characters. +    characterWidthOverrides: ObjectMap<number>; +    // How much room to leave to the right of the scaling input. +    additionalInputSpaceInCh: number;  }  export interface ScalingInputProps { +    type?: string;      textLengthThreshold: number;      maxFontSizePx: number;      value: string; @@ -31,32 +37,29 @@ export interface ScalingInputProps {      hasAutofocus: boolean;  } -export interface ScalingInputState { -    inputWidthPxAtPhaseChange?: number; -} -  export interface ScalingInputSnapshot {      inputWidthPx: number;  }  // These are magic numbers that were determined experimentally.  const defaultScalingSettings: ScalingSettings = { -    percentageToReduceFontSizePerCharacter: 0.125, -    constantPxToIncreaseWidthPerCharacter: 4, +    percentageToReduceFontSizePerCharacter: 0.1, +    characterWidthOverrides: { +        '1': 0.7, +        '.': 0.4, +    }, +    additionalInputSpaceInCh: 0.4,  }; -export class ScalingInput extends React.Component<ScalingInputProps, ScalingInputState> { +export class ScalingInput extends React.Component<ScalingInputProps> {      public static defaultProps = {          onChange: util.boundNoop,          onFontSizeChange: util.boundNoop, -        maxLength: 7, +        maxLength: 9,          scalingSettings: defaultScalingSettings,          isDisabled: false,          hasAutofocus: false,      }; -    public state: ScalingInputState = { -        inputWidthPxAtPhaseChange: undefined, -    };      private readonly _inputRef = React.createRef<HTMLInputElement>();      public static getPhase(textLengthThreshold: number, value: string): ScalingInputPhase {          if (value.length <= textLengthThreshold) { @@ -93,36 +96,15 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu              scalingSettings.percentageToReduceFontSizePerCharacter,          );      } -    public getSnapshotBeforeUpdate(): ScalingInputSnapshot { -        return { -            inputWidthPx: this._getInputWidthInPx(), -        }; -    }      public componentDidMount(): void {          // Trigger an initial notification of the calculated fontSize.          const currentPhase = ScalingInput.getPhaseFromProps(this.props);          const currentFontSize = ScalingInput.calculateFontSizeFromProps(this.props, currentPhase);          this.props.onFontSizeChange(currentFontSize);      } -    public componentDidUpdate( -        prevProps: ScalingInputProps, -        prevState: ScalingInputState, -        snapshot: ScalingInputSnapshot, -    ): void { +    public componentDidUpdate(prevProps: ScalingInputProps): void {          const prevPhase = ScalingInput.getPhaseFromProps(prevProps);          const curPhase = ScalingInput.getPhaseFromProps(this.props); -        // if we went from fixed to scaling, save the width from the transition -        if (prevPhase !== ScalingInputPhase.ScalingFontSize && curPhase === ScalingInputPhase.ScalingFontSize) { -            this.setState({ -                inputWidthPxAtPhaseChange: snapshot.inputWidthPx, -            }); -        } -        // if we went from scaling to fixed, revert back to scaling using `ch` -        if (prevPhase === ScalingInputPhase.ScalingFontSize && curPhase !== ScalingInputPhase.ScalingFontSize) { -            this.setState({ -                inputWidthPxAtPhaseChange: undefined, -            }); -        }          const prevFontSize = ScalingInput.calculateFontSizeFromProps(prevProps, prevPhase);          const curFontSize = ScalingInput.calculateFontSizeFromProps(this.props, curPhase);          // If font size has changed, notify. @@ -131,13 +113,14 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu          }      }      public render(): React.ReactNode { -        const { hasAutofocus, isDisabled, fontColor, onChange, placeholder, value, maxLength } = this.props; +        const { type, hasAutofocus, isDisabled, fontColor, placeholder, value, maxLength } = this.props;          const phase = ScalingInput.getPhaseFromProps(this.props);          return (              <Input +                type={type}                  ref={this._inputRef as any}                  fontColor={fontColor} -                onChange={onChange} +                onChange={this._handleChange}                  value={value}                  placeholder={placeholder}                  fontSize={`${this._calculateFontSize(phase)}px`} @@ -149,32 +132,34 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu          );      }      private readonly _calculateWidth = (phase: ScalingInputPhase): string => { -        const { value, textLengthThreshold, scalingSettings } = this.props; +        const { value, scalingSettings } = this.props;          if (_.isEmpty(value)) {              return `${this.props.emptyInputWidthCh}ch`;          } -        switch (phase) { -            case ScalingInputPhase.FixedFontSize: -                return `${value.length}ch`; -            case ScalingInputPhase.ScalingFontSize: -                const { inputWidthPxAtPhaseChange } = this.state; -                if (!_.isUndefined(inputWidthPxAtPhaseChange)) { -                    const charactersOverMax = value.length - textLengthThreshold; -                    const scalingAmount = scalingSettings.constantPxToIncreaseWidthPerCharacter * charactersOverMax; -                    const width = inputWidthPxAtPhaseChange + scalingAmount; -                    return `${width}px`; +        const lengthInCh = _.reduce( +            value.split(''), +            (sum, char) => { +                const widthOverride = scalingSettings.characterWidthOverrides[char]; +                if (!_.isUndefined(widthOverride)) { +                    // tslint is confused +                    // tslint:disable-next-line:restrict-plus-operands +                    return sum + widthOverride;                  } -                return `${textLengthThreshold}ch`; -        } +                return sum + 1; +            }, +            scalingSettings.additionalInputSpaceInCh, +        ); +        return `${lengthInCh}ch`;      };      private readonly _calculateFontSize = (phase: ScalingInputPhase): number => {          return ScalingInput.calculateFontSizeFromProps(this.props, phase);      }; -    private readonly _getInputWidthInPx = (): number => { -        const ref = this._inputRef.current; -        if (!ref) { -            return 0; +    private readonly _handleChange = (event: React.ChangeEvent<HTMLInputElement>): void => { +        const value = event.target.value; +        const { maxLength } = this.props; +        if (!_.isUndefined(value) && !_.isUndefined(maxLength) && value.length > maxLength) { +            return;          } -        return ref.getBoundingClientRect().width; +        this.props.onChange(event);      };  } diff --git a/packages/instant/src/components/ui/input.tsx b/packages/instant/src/components/ui/input.tsx index 62c70f9e1..53c43ea0b 100644 --- a/packages/instant/src/components/ui/input.tsx +++ b/packages/instant/src/components/ui/input.tsx @@ -2,7 +2,7 @@ import * as React from 'react';  import { ColorOption, styled } from '../../style/theme'; -export interface InputProps { +export interface InputProps extends React.HTMLAttributes<HTMLInputElement> {      tabIndex?: number;      className?: string;      value?: string; @@ -32,6 +32,10 @@ export const Input =              color: ${props => props.theme[props.fontColor || 'white']} !important;              opacity: 0.5 !important;          } +        &::-webkit-outer-spin-button, &::-webkit-inner-spin-button { +            -webkit-appearance: none; +            margin: 0; +          }      }  `; diff --git a/packages/instant/src/redux/async_data.ts b/packages/instant/src/redux/async_data.ts index c67b222d1..932eb93e9 100644 --- a/packages/instant/src/redux/async_data.ts +++ b/packages/instant/src/redux/async_data.ts @@ -97,6 +97,7 @@ export const asyncData = {          if (              !_.isUndefined(selectedAssetUnitAmount) &&              !_.isUndefined(selectedAsset) && +            selectedAssetUnitAmount.greaterThan(BIG_NUMBER_ZERO) &&              buyOrderState.processState === OrderProcessState.None &&              selectedAsset.metaData.assetProxyId === AssetProxyId.ERC20          ) { diff --git a/packages/instant/src/types.ts b/packages/instant/src/types.ts index 86e87c6ea..1c7490e63 100644 --- a/packages/instant/src/types.ts +++ b/packages/instant/src/types.ts @@ -185,6 +185,7 @@ export interface ZeroExInstantRequiredBaseConfig {  export interface ZeroExInstantOptionalBaseConfig {      provider: Provider; +    walletDisplayName: string;      availableAssetDatas: string[];      defaultAssetBuyAmount: number;      defaultSelectedAssetData: string; diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 07649aa60..201190145 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.1.4", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.1.3",          "changes": [              { diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index cb5d315c2..7e407bdda 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.1.4 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.1.3 - _December 11, 2018_      * Dependencies updated diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 01662beed..57dd9dc00 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/json-schemas", -    "version": "2.1.3", +    "version": "2.1.4",      "engines": {          "node": ">=6.12"      }, @@ -39,14 +39,14 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",      "dependencies": { -        "@0x/typescript-typings": "^3.0.5", +        "@0x/typescript-typings": "^3.0.6",          "@types/node": "*",          "jsonschema": "^1.2.0",          "lodash.values": "^4.3.0"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", -        "@0x/utils": "^2.0.7", +        "@0x/tslint-config": "^2.0.0", +        "@0x/utils": "^2.0.8",          "@types/lodash.foreach": "^4.5.3",          "@types/lodash.values": "^4.3.3",          "@types/mocha": "^2.2.42", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index e51b240db..0e9fa4920 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/metacoin", -    "version": "0.0.31", +    "version": "0.0.32",      "engines": {          "node": ">=6.12"      }, @@ -29,26 +29,26 @@      "author": "",      "license": "Apache-2.0",      "dependencies": { -        "@0x/abi-gen": "^1.0.18", +        "@0x/abi-gen": "^1.0.19",          "@0x/abi-gen-templates": "^1.0.1", -        "@0x/base-contract": "^3.0.9", -        "@0x/sol-cov": "^2.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/tslint-config": "^1.0.10", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/base-contract": "^3.0.10", +        "@0x/sol-cov": "^2.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/tslint-config": "^2.0.0", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/mocha": "^5.2.2",          "copyfiles": "^2.0.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethers": "~4.0.4",          "lodash": "^4.17.5",          "run-s": "^0.0.0"      },      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16",          "chai": "^4.0.1",          "chai-as-promised": "^7.1.0",          "chai-bignumber": "^2.0.1", diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 8e109414d..e7b18f12b 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.2.2", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.2.1",          "changes": [              { diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md index 7ea114fa1..0b7b9a364 100644 --- a/packages/migrations/CHANGELOG.md +++ b/packages/migrations/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.2.2 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.2.1 - _December 11, 2018_      * Dependencies updated diff --git a/packages/migrations/package.json b/packages/migrations/package.json index b2d16c0ee..72ffe67b2 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/migrations", -    "version": "2.2.1", +    "version": "2.2.2",      "engines": {          "node": ">=6.12"      }, @@ -26,9 +26,9 @@      },      "license": "Apache-2.0",      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/tslint-config": "^1.0.10", -        "@0x/types": "^1.4.0", +        "@0x/dev-utils": "^1.0.21", +        "@0x/tslint-config": "^2.0.0", +        "@0x/types": "^1.4.1",          "@types/yargs": "^10.0.0",          "make-promises-safe": "^1.1.0",          "npm-run-all": "^4.1.2", @@ -39,18 +39,18 @@          "yargs": "^10.0.3"      },      "dependencies": { -        "@0x/abi-gen-wrappers": "^2.0.1", -        "@0x/base-contract": "^3.0.9", +        "@0x/abi-gen-wrappers": "^2.0.2", +        "@0x/base-contract": "^3.0.10",          "@0x/contract-addresses": "^2.0.0",          "@0x/contract-artifacts": "^1.1.2", -        "@0x/order-utils": "^3.0.6", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/order-utils": "^3.0.7", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@ledgerhq/hw-app-eth": "^4.3.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethers": "~4.0.4",          "lodash": "^4.17.5"      }, diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index d974028be..11889b92e 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "3.0.7", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "3.0.6",          "changes": [              { diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index 7b7334db8..bc8b48767 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v3.0.7 - _December 13, 2018_ + +    * Dependencies updated +  ## v3.0.6 - _December 11, 2018_      * Fix bug in wallet signature type verification (#1414) diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 55541787a..400c9b66f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/order-utils", -    "version": "3.0.6", +    "version": "3.0.7",      "engines": {          "node": ">=6.12"      }, @@ -35,8 +35,8 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/tslint-config": "^2.0.0",          "@types/bn.js": "^4.11.0",          "@types/lodash": "4.14.104",          "chai": "^4.0.1", @@ -53,18 +53,18 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/abi-gen-wrappers": "^2.0.1", -        "@0x/assert": "^1.0.19", -        "@0x/base-contract": "^3.0.9", +        "@0x/abi-gen-wrappers": "^2.0.2", +        "@0x/assert": "^1.0.20", +        "@0x/base-contract": "^3.0.10",          "@0x/contract-artifacts": "^1.1.2", -        "@0x/json-schemas": "^2.1.3", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/json-schemas": "^2.1.4", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/node": "*",          "bn.js": "^4.11.8", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-abi": "0.6.5",          "ethereumjs-util": "^5.1.1",          "ethers": "~4.0.4", diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 9730e68b7..c1fd8d4a9 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.2.8", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.2.7",          "changes": [              { diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md index 30b4516cf..4e49b4637 100644 --- a/packages/order-watcher/CHANGELOG.md +++ b/packages/order-watcher/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.2.8 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.2.7 - _December 11, 2018_      * Dependencies updated diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index b6c519e94..499d4cead 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/order-watcher", -    "version": "2.2.7", +    "version": "2.2.8",      "description": "An order watcher daemon that watches for order validity",      "keywords": [          "0x", @@ -33,9 +33,9 @@          "node": ">=6.0.0"      },      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/migrations": "^2.2.1", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/migrations": "^2.2.2", +        "@0x/tslint-config": "^2.0.0",          "@types/bintrees": "^1.0.2",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42", @@ -57,21 +57,21 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/abi-gen-wrappers": "^2.0.1", -        "@0x/assert": "^1.0.19", -        "@0x/base-contract": "^3.0.9", +        "@0x/abi-gen-wrappers": "^2.0.2", +        "@0x/assert": "^1.0.20", +        "@0x/base-contract": "^3.0.10",          "@0x/contract-addresses": "^2.0.0",          "@0x/contract-artifacts": "^1.1.2", -        "@0x/contract-wrappers": "^4.1.2", -        "@0x/fill-scenarios": "^1.0.15", -        "@0x/json-schemas": "^2.1.3", -        "@0x/order-utils": "^3.0.6", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/contract-wrappers": "^4.1.3", +        "@0x/fill-scenarios": "^1.0.16", +        "@0x/json-schemas": "^2.1.4", +        "@0x/order-utils": "^3.0.7", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "bintrees": "^1.0.2", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-blockstream": "6.0.0",          "ethers": "~4.0.4",          "lodash": "^4.17.5" diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index 7ba14c6db..a40f3d21c 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/pipeline", -    "version": "1.0.1", +    "version": "1.0.2",      "private": true,      "description": "Data pipeline for offline analysis",      "scripts": { @@ -27,41 +27,35 @@      },      "license": "Apache-2.0",      "devDependencies": { -        "@0x/tslint-config": "^1.0.9", +        "@0x/tslint-config": "^2.0.0",          "@types/axios": "^0.14.0",          "@types/ramda": "^0.25.38", -        "@types/axios": "^0.14.0",          "chai": "^4.1.2",          "chai-as-promised": "^7.1.1",          "chai-bignumber": "^2.0.2",          "dirty-chai": "^2.0.1",          "mocha": "^5.2.0",          "tslint": "5.11.0", -        "typescript": "3.0.1", -        "mocha": "^5.2.0", -        "chai": "^4.1.2", -        "chai-as-promised": "^7.1.1", -        "chai-bignumber": "^2.0.2", -        "dirty-chai": "^2.0.1" +        "typescript": "3.0.1"      },      "dependencies": { -        "@0x/connect": "^3.0.9", +        "@0x/connect": "^3.0.10",          "@0x/contract-addresses": "^2.0.0",          "@0x/contract-artifacts": "^1.0.1",          "@0x/contract-wrappers": "^3.0.0", -        "@0x/dev-utils": "^1.0.20", +        "@0x/dev-utils": "^1.0.21",          "@0x/order-utils": "^2.0.0", -        "@0x/subproviders": "^2.1.7", -        "@0x/types": "^1.4.0", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/subproviders": "^2.1.8", +        "@0x/types": "^1.4.1", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/dockerode": "^2.5.9",          "@types/p-limit": "^2.0.0",          "async-parallel": "^1.2.3",          "axios": "^0.18.0",          "bottleneck": "^2.13.2",          "dockerode": "^2.5.7", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "pg": "^7.5.0",          "prettier": "^1.15.3",          "ramda": "^0.25.0", diff --git a/packages/pipeline/src/ormconfig.ts b/packages/pipeline/src/ormconfig.ts index 27991c430..fe11d81d5 100644 --- a/packages/pipeline/src/ormconfig.ts +++ b/packages/pipeline/src/ormconfig.ts @@ -14,7 +14,6 @@ import {      TokenMetadata,      TokenOrderbookSnapshot,      Transaction, -    TrustedToken,  } from './entities';  const entities = [ @@ -31,7 +30,6 @@ const entities = [      TokenMetadata,      TokenOrderbookSnapshot,      Transaction, -    TrustedToken,  ];  const config: ConnectionOptions = { diff --git a/packages/pipeline/src/parsers/ddex_orders/index.ts b/packages/pipeline/src/parsers/ddex_orders/index.ts index 52a998f9f..d7b97efbe 100644 --- a/packages/pipeline/src/parsers/ddex_orders/index.ts +++ b/packages/pipeline/src/parsers/ddex_orders/index.ts @@ -54,12 +54,14 @@ export function parseDdexOrder(      tokenOrder.orderType = orderType;      tokenOrder.price = price; -    tokenOrder.baseAssetSymbol = ddexMarket.baseToken; -    tokenOrder.baseAssetAddress = ddexMarket.baseTokenAddress; -    tokenOrder.baseVolume = price.times(amount); +    // ddex currently confuses quote and base assets. +    // We switch them here to maintain our internal consistency. +    tokenOrder.baseAssetSymbol = ddexMarket.quoteToken; +    tokenOrder.baseAssetAddress = ddexMarket.quoteTokenAddress; +    tokenOrder.baseVolume = amount; -    tokenOrder.quoteAssetSymbol = ddexMarket.quoteToken; -    tokenOrder.quoteAssetAddress = ddexMarket.quoteTokenAddress; -    tokenOrder.quoteVolume = amount; +    tokenOrder.quoteAssetSymbol = ddexMarket.baseToken; +    tokenOrder.quoteAssetAddress = ddexMarket.baseTokenAddress; +    tokenOrder.quoteVolume = price.times(amount);      return tokenOrder;  } diff --git a/packages/pipeline/src/parsers/oasis_orders/index.ts b/packages/pipeline/src/parsers/oasis_orders/index.ts index 7aafbf460..13997f31b 100644 --- a/packages/pipeline/src/parsers/oasis_orders/index.ts +++ b/packages/pipeline/src/parsers/oasis_orders/index.ts @@ -62,10 +62,10 @@ export function parseOasisOrder(      tokenOrder.baseAssetSymbol = oasisMarket.base;      tokenOrder.baseAssetAddress = null; // Oasis doesn't provide address information -    tokenOrder.baseVolume = price.times(amount); +    tokenOrder.baseVolume = amount;      tokenOrder.quoteAssetSymbol = oasisMarket.quote;      tokenOrder.quoteAssetAddress = null; // Oasis doesn't provide address information -    tokenOrder.quoteVolume = amount; +    tokenOrder.quoteVolume = price.times(amount);      return tokenOrder;  } diff --git a/packages/pipeline/src/parsers/paradex_orders/index.ts b/packages/pipeline/src/parsers/paradex_orders/index.ts index 7966658a7..5ceeb64a4 100644 --- a/packages/pipeline/src/parsers/paradex_orders/index.ts +++ b/packages/pipeline/src/parsers/paradex_orders/index.ts @@ -57,10 +57,10 @@ export function parseParadexOrder(      tokenOrder.baseAssetSymbol = paradexMarket.baseToken;      tokenOrder.baseAssetAddress = paradexMarket.baseTokenAddress as string; -    tokenOrder.baseVolume = price.times(amount); +    tokenOrder.baseVolume = amount;      tokenOrder.quoteAssetSymbol = paradexMarket.quoteToken;      tokenOrder.quoteAssetAddress = paradexMarket.quoteTokenAddress as string; -    tokenOrder.quoteVolume = amount; +    tokenOrder.quoteVolume = price.times(amount);      return tokenOrder;  } diff --git a/packages/pipeline/src/parsers/token_metadata/index.ts b/packages/pipeline/src/parsers/token_metadata/index.ts index f258af063..65e0aaa6e 100644 --- a/packages/pipeline/src/parsers/token_metadata/index.ts +++ b/packages/pipeline/src/parsers/token_metadata/index.ts @@ -1,9 +1,8 @@ -import { BigNumber } from '@0x/utils';  import * as R from 'ramda';  import { MetamaskTrustedTokenMeta, ZeroExTrustedTokenMeta } from '../../data_sources/trusted_tokens';  import { TokenMetadata } from '../../entities'; -import {} from '../../utils'; +import { toBigNumberOrNull } from '../../utils';  /**   * Parses Metamask's trusted tokens list. @@ -26,7 +25,7 @@ function parseMetamaskTrustedToken(resp: MetamaskTrustedTokenMeta, address: stri      const trustedToken = new TokenMetadata();      trustedToken.address = address; -    trustedToken.decimals = new BigNumber(resp.decimals); +    trustedToken.decimals = toBigNumberOrNull(resp.decimals);      trustedToken.symbol = resp.symbol;      trustedToken.name = resp.name;      trustedToken.authority = 'metamask'; @@ -38,7 +37,7 @@ function parseZeroExTrustedToken(resp: ZeroExTrustedTokenMeta): TokenMetadata {      const trustedToken = new TokenMetadata();      trustedToken.address = resp.address; -    trustedToken.decimals = resp.decimals ? new BigNumber(resp.decimals) : null; +    trustedToken.decimals = toBigNumberOrNull(resp.decimals);      trustedToken.symbol = resp.symbol;      trustedToken.name = resp.name;      trustedToken.authority = '0x'; diff --git a/packages/pipeline/src/scripts/pull_competing_dex_trades.ts b/packages/pipeline/src/scripts/pull_competing_dex_trades.ts index 4e4c12dd0..1478d5615 100644 --- a/packages/pipeline/src/scripts/pull_competing_dex_trades.ts +++ b/packages/pipeline/src/scripts/pull_competing_dex_trades.ts @@ -15,11 +15,11 @@ let connection: Connection;  (async () => {      connection = await createConnection(ormConfig as ConnectionOptions); -    await getAndSaveTrades(); +    await getAndSaveTradesAsync();      process.exit(0);  })().catch(handleError); -async function getAndSaveTrades(): Promise<void> { +async function getAndSaveTradesAsync(): Promise<void> {      const apiKey = process.env.BLOXY_API_KEY;      if (apiKey === undefined) {          throw new Error('Missing required env var: BLOXY_API_KEY'); diff --git a/packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts b/packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts index 7868e9c5a..4e00f258f 100644 --- a/packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts +++ b/packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts @@ -25,7 +25,7 @@ let connection: Connection;      const markets = await ddexSource.getActiveMarketsAsync();      for (const marketsChunk of R.splitEvery(MARKET_ORDERBOOK_REQUEST_BATCH_SIZE, markets)) {          await Promise.all( -            marketsChunk.map(async (market: DdexMarket) => getAndSaveMarketOrderbook(ddexSource, market)), +            marketsChunk.map(async (market: DdexMarket) => getAndSaveMarketOrderbookAsync(ddexSource, market)),          );          await new Promise<void>(resolve => setTimeout(resolve, MILLISEC_MARKET_ORDERBOOK_REQUEST_DELAY));      } @@ -38,7 +38,7 @@ let connection: Connection;   * @param ddexSource Data source which can query Ddex API.   * @param market Object from Ddex API containing market data.   */ -async function getAndSaveMarketOrderbook(ddexSource: DdexSource, market: DdexMarket): Promise<void> { +async function getAndSaveMarketOrderbookAsync(ddexSource: DdexSource, market: DdexMarket): Promise<void> {      const orderBook = await ddexSource.getMarketOrderbookAsync(market.id);      const observedTimestamp = Date.now(); diff --git a/packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts b/packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts index d47c1dd3f..490b17766 100644 --- a/packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts +++ b/packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts @@ -27,7 +27,7 @@ let connection: Connection;      logUtils.log(`Got ${markets.length} markets.`);      for (const marketsChunk of R.splitEvery(MARKET_ORDERBOOK_REQUEST_BATCH_SIZE, markets)) {          await Promise.all( -            marketsChunk.map(async (marketId: string) => getAndSaveMarketOrderbook(idexSource, marketId)), +            marketsChunk.map(async (marketId: string) => getAndSaveMarketOrderbookAsync(idexSource, marketId)),          );          await new Promise<void>(resolve => setTimeout(resolve, MILLISEC_MARKET_ORDERBOOK_REQUEST_DELAY));      } @@ -40,7 +40,7 @@ let connection: Connection;   * @param idexSource Data source which can query Idex API.   * @param marketId String representing market of interest, eg. 'ETH_TIC'.   */ -async function getAndSaveMarketOrderbook(idexSource: IdexSource, marketId: string): Promise<void> { +async function getAndSaveMarketOrderbookAsync(idexSource: IdexSource, marketId: string): Promise<void> {      logUtils.log(`${marketId}: Retrieving orderbook.`);      const orderBook = await idexSource.getMarketOrderbookAsync(marketId);      const observedTimestamp = Date.now(); diff --git a/packages/pipeline/src/scripts/pull_missing_blocks.ts b/packages/pipeline/src/scripts/pull_missing_blocks.ts index 275141a12..a5203824c 100644 --- a/packages/pipeline/src/scripts/pull_missing_blocks.ts +++ b/packages/pipeline/src/scripts/pull_missing_blocks.ts @@ -27,7 +27,7 @@ let connection: Connection;          rpcUrl: INFURA_ROOT_URL,      });      const web3Source = new Web3Source(provider); -    await getAllMissingBlocks(web3Source); +    await getAllMissingBlocksAsync(web3Source);      process.exit(0);  })().catch(handleError); @@ -35,23 +35,23 @@ interface MissingBlocksResponse {      block_number: string;  } -async function getAllMissingBlocks(web3Source: Web3Source): Promise<void> { +async function getAllMissingBlocksAsync(web3Source: Web3Source): Promise<void> {      const blocksRepository = connection.getRepository(Block);      let fromBlock = EXCHANGE_START_BLOCK;      while (true) { -        const blockNumbers = await getMissingBlockNumbers(fromBlock); +        const blockNumbers = await getMissingBlockNumbersAsync(fromBlock);          if (blockNumbers.length === 0) {              // There are no more missing blocks. We're done.              break;          } -        await getAndSaveBlocks(web3Source, blocksRepository, blockNumbers); +        await getAndSaveBlocksAsync(web3Source, blocksRepository, blockNumbers);          fromBlock = Math.max(...blockNumbers) + 1;      }      const totalBlocks = await blocksRepository.count();      console.log(`Done saving blocks. There are now ${totalBlocks} total blocks.`);  } -async function getMissingBlockNumbers(fromBlock: number): Promise<number[]> { +async function getMissingBlockNumbersAsync(fromBlock: number): Promise<number[]> {      console.log(`Checking for missing blocks starting at ${fromBlock}...`);      // Note(albrow): The easiest way to get all the blocks we need is to      // consider all the events tables together in a single query. If this query @@ -76,7 +76,7 @@ async function getMissingBlockNumbers(fromBlock: number): Promise<number[]> {      return blockNumbers;  } -async function getAndSaveBlocks( +async function getAndSaveBlocksAsync(      web3Source: Web3Source,      blocksRepository: Repository<Block>,      blockNumbers: number[], diff --git a/packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts b/packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts index 0ffa5fd47..c4dcf6c83 100644 --- a/packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts +++ b/packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts @@ -27,7 +27,7 @@ let connection: Connection;      logUtils.log(`Got ${markets.length} markets.`);      for (const marketsChunk of R.splitEvery(MARKET_ORDERBOOK_REQUEST_BATCH_SIZE, markets)) {          await Promise.all( -            marketsChunk.map(async (market: OasisMarket) => getAndSaveMarketOrderbook(oasisSource, market)), +            marketsChunk.map(async (market: OasisMarket) => getAndSaveMarketOrderbookAsync(oasisSource, market)),          );          await new Promise<void>(resolve => setTimeout(resolve, MILLISEC_MARKET_ORDERBOOK_REQUEST_DELAY));      } @@ -40,7 +40,7 @@ let connection: Connection;   * @param oasisSource Data source which can query Oasis API.   * @param marketId String identifying market we want data for. eg. 'REPAUG'.   */ -async function getAndSaveMarketOrderbook(oasisSource: OasisSource, market: OasisMarket): Promise<void> { +async function getAndSaveMarketOrderbookAsync(oasisSource: OasisSource, market: OasisMarket): Promise<void> {      logUtils.log(`${market.id}: Retrieving orderbook.`);      const orderBook = await oasisSource.getMarketOrderbookAsync(market.id);      const observedTimestamp = Date.now(); diff --git a/packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts b/packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts index bae1fbede..34345f355 100644 --- a/packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts +++ b/packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts @@ -29,7 +29,7 @@ let connection: Connection;      const tokenInfoResponse = await paradexSource.getTokenInfoAsync();      const extendedMarkets = addTokenAddresses(markets, tokenInfoResponse);      await Promise.all( -        extendedMarkets.map(async (market: ParadexMarket) => getAndSaveMarketOrderbook(paradexSource, market)), +        extendedMarkets.map(async (market: ParadexMarket) => getAndSaveMarketOrderbookAsync(paradexSource, market)),      );      process.exit(0);  })().catch(handleError); @@ -70,7 +70,7 @@ function addTokenAddresses(   * @param paradexSource Data source which can query the Paradex API.   * @param market Object from the Paradex API with information about the market in question.   */ -async function getAndSaveMarketOrderbook(paradexSource: ParadexSource, market: ParadexMarket): Promise<void> { +async function getAndSaveMarketOrderbookAsync(paradexSource: ParadexSource, market: ParadexMarket): Promise<void> {      const paradexOrderbookResponse = await paradexSource.getMarketOrderbookAsync(market.symbol);      const observedTimestamp = Date.now(); diff --git a/packages/pipeline/src/scripts/pull_trusted_tokens.ts b/packages/pipeline/src/scripts/pull_trusted_tokens.ts index 1befc4437..5906deee6 100644 --- a/packages/pipeline/src/scripts/pull_trusted_tokens.ts +++ b/packages/pipeline/src/scripts/pull_trusted_tokens.ts @@ -16,12 +16,12 @@ let connection: Connection;  (async () => {      connection = await createConnection(ormConfig as ConnectionOptions); -    await getMetamaskTrustedTokens(); -    await getZeroExTrustedTokens(); +    await getMetamaskTrustedTokensAsync(); +    await getZeroExTrustedTokensAsync();      process.exit(0);  })().catch(handleError); -async function getMetamaskTrustedTokens(): Promise<void> { +async function getMetamaskTrustedTokensAsync(): Promise<void> {      // tslint:disable-next-line:no-console      console.log('Getting latest metamask trusted tokens list ...');      const trustedTokensRepository = connection.getRepository(TokenMetadata); @@ -37,7 +37,7 @@ async function getMetamaskTrustedTokens(): Promise<void> {      console.log('Done saving metamask trusted tokens.');  } -async function getZeroExTrustedTokens(): Promise<void> { +async function getZeroExTrustedTokensAsync(): Promise<void> {      // tslint:disable-next-line:no-console      console.log('Getting latest 0x trusted tokens list ...');      const trustedTokensRepository = connection.getRepository(TokenMetadata); diff --git a/packages/pipeline/src/scripts/update_relayer_info.ts b/packages/pipeline/src/scripts/update_relayer_info.ts index f8918728d..41d29b385 100644 --- a/packages/pipeline/src/scripts/update_relayer_info.ts +++ b/packages/pipeline/src/scripts/update_relayer_info.ts @@ -17,11 +17,11 @@ let connection: Connection;  (async () => {      connection = await createConnection(ormConfig as ConnectionOptions); -    await getRelayers(); +    await getRelayersAsync();      process.exit(0);  })().catch(handleError); -async function getRelayers(): Promise<void> { +async function getRelayersAsync(): Promise<void> {      console.log('Getting latest relayer info...');      const relayerRepository = connection.getRepository(Relayer);      const relayerSource = new RelayerRegistrySource(RELAYER_REGISTRY_URL); diff --git a/packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts b/packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts index 9d3ef2fba..19f81344e 100644 --- a/packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts +++ b/packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts @@ -23,6 +23,18 @@ interface CryptoCompareCoin {  const TO_CURRENCIES = ['USD', 'EUR', 'ETH', 'USDT'];  const ETHEREUM_IDENTIFIER = '7605';  const HTTP_OK_STATUS = 200; + +interface StaticPair { +    fromSymbol: string; +    toSymbol: string; +} +const SPECIAL_CASES: StaticPair[] = [ +    { +        fromSymbol: 'ETH', +        toSymbol: 'USD', +    }, +]; +  /**   * Get trading pairs with latest scraped time for OHLCV records   * @param conn a typeorm Connection to postgres @@ -44,6 +56,7 @@ export async function fetchOHLCVTradingPairsAsync(      FROM raw.ohlcv_external      GROUP BY from_symbol, to_symbol;`); +    // build addressable index: { fromsym: { tosym: time }}      const latestTradingPairsIndex: { [fromSym: string]: { [toSym: string]: number } } = {};      latestTradingPairs.forEach(pair => {          const latestIndex: { [toSym: string]: number } = latestTradingPairsIndex[pair.from_symbol] || {}; @@ -51,6 +64,13 @@ export async function fetchOHLCVTradingPairsAsync(          latestTradingPairsIndex[pair.from_symbol] = latestIndex;      }); +    // match time to special cases +    const specialCases: TradingPair[] = SPECIAL_CASES.map(pair => { +        const latestSavedTime = +            R.path<number>([pair.fromSymbol, pair.toSymbol], latestTradingPairsIndex) || earliestBackfillTime; +        return R.assoc('latestSavedTime', latestSavedTime, pair); +    }); +      // get token symbols used by Crypto Compare      const allCoinsResp = await fetchAsync(COINLIST_API);      if (allCoinsResp.status !== HTTP_OK_STATUS) { @@ -66,27 +86,31 @@ export async function fetchOHLCVTradingPairsAsync(      });      // fetch all tokens that are traded on 0x -    const rawTokenAddresses: Array<{ tokenaddress: string }> = await conn.query( +    const rawEventTokenAddresses: Array<{ tokenaddress: string }> = await conn.query(          `SELECT DISTINCT(maker_token_address) as tokenaddress FROM raw.exchange_fill_events UNION        SELECT DISTINCT(taker_token_address) as tokenaddress FROM raw.exchange_fill_events`,      ); -    const tokenAddresses = R.pluck('tokenaddress', rawTokenAddresses); + +    // tslint:disable-next-line:no-unbound-method +    const eventTokenAddresses = R.pluck('tokenaddress', rawEventTokenAddresses).map(R.toLower);      // join token addresses with CC symbols -    const allTokenSymbols: string[] = tokenAddresses -        .map(tokenAddress => erc20CoinsIndex.get(tokenAddress.toLowerCase()) || '') -        .filter(x => x); +    const eventTokenSymbols: string[] = eventTokenAddresses +        .filter(tokenAddress => erc20CoinsIndex.has(tokenAddress)) +        .map(tokenAddress => erc20CoinsIndex.get(tokenAddress) as string); -    // generate list of all tokens with time of latest existing record OR default earliest time -    const allTradingPairCombinations: TradingPair[] = R.chain(sym => { +    // join traded tokens with fiat and latest backfill time +    const eventTradingPairs: TradingPair[] = R.chain(sym => {          return TO_CURRENCIES.map(fiat => { -            return { +            const pair = {                  fromSymbol: sym,                  toSymbol: fiat,                  latestSavedTime: R.path<number>([sym, fiat], latestTradingPairsIndex) || earliestBackfillTime,              }; +            return pair;          }); -    }, allTokenSymbols); +    }, eventTokenSymbols); -    return allTradingPairCombinations; +    // join with special cases +    return R.concat(eventTradingPairs, specialCases);  } diff --git a/packages/pipeline/src/utils/index.ts b/packages/pipeline/src/utils/index.ts index 2096a0a39..094c0178e 100644 --- a/packages/pipeline/src/utils/index.ts +++ b/packages/pipeline/src/utils/index.ts @@ -15,6 +15,21 @@ export function bigNumbertoStringOrNull(n: BigNumber): string | null {  }  /** + * If value is null or undefined, returns null. Otherwise converts value to a + * BigNumber. + * @param value A string or number to be converted to a BigNumber + */ +export function toBigNumberOrNull(value: string | number | null): BigNumber | null { +    switch (value) { +        case null: +        case undefined: +            return null; +        default: +            return new BigNumber(value); +    } +} + +/**   * Logs an error by intelligently checking for `message` and `stack` properties.   * Intended for use with top-level immediately invoked asynchronous functions.   * @param e the error to log. diff --git a/packages/pipeline/test/parsers/ddex_orders/index_test.ts b/packages/pipeline/test/parsers/ddex_orders/index_test.ts index 9f4bfe7e3..4a4a86bf8 100644 --- a/packages/pipeline/test/parsers/ddex_orders/index_test.ts +++ b/packages/pipeline/test/parsers/ddex_orders/index_test.ts @@ -39,12 +39,14 @@ describe('ddex_orders', () => {              expected.observedTimestamp = observedTimestamp;              expected.orderType = 'bid';              expected.price = new BigNumber(0.5); -            expected.baseAssetSymbol = 'DEF'; -            expected.baseAssetAddress = '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81'; -            expected.baseVolume = new BigNumber(5); -            expected.quoteAssetSymbol = 'ABC'; -            expected.quoteAssetAddress = '0x0000000000000000000000000000000000000000'; -            expected.quoteVolume = new BigNumber(10); +            // ddex currently confuses base and quote assets. +            // Switch them to maintain our internal consistency. +            expected.baseAssetSymbol = 'ABC'; +            expected.baseAssetAddress = '0x0000000000000000000000000000000000000000'; +            expected.baseVolume = new BigNumber(10); +            expected.quoteAssetSymbol = 'DEF'; +            expected.quoteAssetAddress = '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81'; +            expected.quoteVolume = new BigNumber(5);              const actual = parseDdexOrder(ddexMarket, observedTimestamp, orderType, source, ddexOrder);              expect(actual).deep.equal(expected); diff --git a/packages/pipeline/test/parsers/oasis_orders/index_test.ts b/packages/pipeline/test/parsers/oasis_orders/index_test.ts index 9e8ba9a40..433bfb665 100644 --- a/packages/pipeline/test/parsers/oasis_orders/index_test.ts +++ b/packages/pipeline/test/parsers/oasis_orders/index_test.ts @@ -37,10 +37,10 @@ describe('oasis_orders', () => {              expected.price = new BigNumber(0.5);              expected.baseAssetSymbol = 'DEF';              expected.baseAssetAddress = null; -            expected.baseVolume = new BigNumber(5); +            expected.baseVolume = new BigNumber(10);              expected.quoteAssetSymbol = 'ABC';              expected.quoteAssetAddress = null; -            expected.quoteVolume = new BigNumber(10); +            expected.quoteVolume = new BigNumber(5);              const actual = parseOasisOrder(oasisMarket, observedTimestamp, orderType, source, oasisOrder);              expect(actual).deep.equal(expected); diff --git a/packages/pipeline/test/parsers/paradex_orders/index_test.ts b/packages/pipeline/test/parsers/paradex_orders/index_test.ts index 1522806bf..6b811b90d 100644 --- a/packages/pipeline/test/parsers/paradex_orders/index_test.ts +++ b/packages/pipeline/test/parsers/paradex_orders/index_test.ts @@ -42,10 +42,10 @@ describe('paradex_orders', () => {              expected.price = new BigNumber(0.1245);              expected.baseAssetSymbol = 'DEF';              expected.baseAssetAddress = '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81'; -            expected.baseVolume = new BigNumber(412 * 0.1245); +            expected.baseVolume = new BigNumber(412);              expected.quoteAssetSymbol = 'ABC';              expected.quoteAssetAddress = '0x0000000000000000000000000000000000000000'; -            expected.quoteVolume = new BigNumber(412); +            expected.quoteVolume = new BigNumber(412 * 0.1245);              const actual = parseParadexOrder(paradexMarket, observedTimestamp, orderType, source, paradexOrder);              expect(actual).deep.equal(expected); diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 51d3be8ec..9d8b5bc88 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.22", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.21",          "changes": [              { diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index fc8f7db1f..5c702d562 100644 --- a/packages/react-docs/CHANGELOG.md +++ b/packages/react-docs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.22 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.21 - _December 11, 2018_      * Dependencies updated diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index b4de54a21..f58a51c90 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/react-docs", -    "version": "1.0.21", +    "version": "1.0.22",      "engines": {          "node": ">=6.12"      }, @@ -24,8 +24,8 @@          "url": "https://github.com/0xProject/0x-monorepo.git"      },      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/tslint-config": "^2.0.0",          "@types/compare-versions": "^3.0.0",          "@types/styled-components": "^4.0.0",          "make-promises-safe": "^1.1.0", @@ -34,9 +34,9 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/react-shared": "^1.0.24", -        "@0x/types": "^1.4.0", -        "@0x/utils": "^2.0.7", +        "@0x/react-shared": "^1.0.25", +        "@0x/types": "^1.4.1", +        "@0x/utils": "^2.0.8",          "@types/lodash": "4.14.104",          "@types/material-ui": "^0.20.0",          "@types/node": "*", diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 985e56814..23e0d7f7e 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.25", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.24",          "changes": [              { diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index 456eb765a..8afa94e04 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.25 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.24 - _December 11, 2018_      * Dependencies updated diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 125edf374..17defe35a 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/react-shared", -    "version": "1.0.24", +    "version": "1.0.25",      "engines": {          "node": ">=6.12"      }, @@ -25,15 +25,15 @@          "url": "https://github.com/0xProject/0x-monorepo.git"      },      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/tslint-config": "^2.0.0",          "make-promises-safe": "^1.1.0",          "shx": "^0.2.2",          "tslint": "^5.9.1",          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/types": "^1.4.0", +        "@0x/types": "^1.4.1",          "@material-ui/core": "^3.0.1",          "@types/is-mobile": "0.3.0",          "@types/lodash": "4.14.104", diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 8da8726e7..0a757f519 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.1.16", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.1.15",          "changes": [              { diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md index 05b48f0fc..b2066448d 100644 --- a/packages/sol-compiler/CHANGELOG.md +++ b/packages/sol-compiler/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.1.16 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.1.15 - _December 11, 2018_      * Fix bug where we were appending base path to absolute imports (e.g NPM imports) (#1311) diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 35c3012f6..0ad620b1f 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/sol-compiler", -    "version": "1.1.15", +    "version": "1.1.16",      "engines": {          "node": ">=6.12"      }, @@ -42,8 +42,8 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",      "devDependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/tslint-config": "^1.0.10", +        "@0x/dev-utils": "^1.0.21", +        "@0x/tslint-config": "^2.0.0",          "@types/mkdirp": "^0.5.2",          "@types/require-from-string": "^1.2.0",          "@types/semver": "^5.5.0", @@ -65,16 +65,16 @@          "zeppelin-solidity": "1.8.0"      },      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/json-schemas": "^2.1.3", -        "@0x/sol-resolver": "^1.1.0", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/assert": "^1.0.20", +        "@0x/json-schemas": "^2.1.4", +        "@0x/sol-resolver": "^1.1.1", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/yargs": "^11.0.0",          "chalk": "^2.3.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.5",          "mkdirp": "^0.5.1", diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json index 45b57bdac..b7973c135 100644 --- a/packages/sol-cov/CHANGELOG.json +++ b/packages/sol-cov/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.1.16", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.1.15",          "changes": [              { diff --git a/packages/sol-cov/CHANGELOG.md b/packages/sol-cov/CHANGELOG.md index c827b1865..879ef9c95 100644 --- a/packages/sol-cov/CHANGELOG.md +++ b/packages/sol-cov/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.1.16 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.1.15 - _December 11, 2018_      * Dependencies updated diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index aae65107a..3ade51c80 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/sol-cov", -    "version": "2.1.15", +    "version": "2.1.16",      "engines": {          "node": ">=6.12"      }, @@ -42,14 +42,14 @@      },      "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",      "dependencies": { -        "@0x/dev-utils": "^1.0.20", -        "@0x/sol-compiler": "^1.1.15", -        "@0x/subproviders": "^2.1.7", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/dev-utils": "^1.0.21", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/subproviders": "^2.1.8", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@types/solidity-parser-antlr": "^0.2.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "glob": "^7.1.2",          "istanbul": "^0.4.5", @@ -61,7 +61,7 @@          "solidity-parser-antlr": "^0.2.12"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/istanbul": "^0.4.30",          "@types/loglevel": "^1.5.3",          "@types/mkdirp": "^0.5.1", diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json index 9c6d724bc..e8fef746e 100644 --- a/packages/sol-doc/CHANGELOG.json +++ b/packages/sol-doc/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.11", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.10",          "changes": [              { diff --git a/packages/sol-doc/CHANGELOG.md b/packages/sol-doc/CHANGELOG.md index 5a1fa1d5a..1b4a938af 100644 --- a/packages/sol-doc/CHANGELOG.md +++ b/packages/sol-doc/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.11 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.10 - _December 11, 2018_      * Dependencies updated diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json index 1d2762875..c83c122df 100644 --- a/packages/sol-doc/package.json +++ b/packages/sol-doc/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/sol-doc", -    "version": "1.0.10", +    "version": "1.0.11",      "description": "Solidity documentation generator",      "main": "lib/src/index.js",      "types": "lib/src/index.d.js", @@ -25,16 +25,16 @@      "author": "F. Eugene Aumson",      "license": "Apache-2.0",      "dependencies": { -        "@0x/sol-compiler": "^1.1.15", -        "@0x/types": "^1.4.0", -        "@0x/utils": "^2.0.7", -        "ethereum-types": "^1.1.3", +        "@0x/sol-compiler": "^1.1.16", +        "@0x/types": "^1.4.1", +        "@0x/utils": "^2.0.8", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "lodash": "^4.17.10",          "yargs": "^12.0.2"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "chai": "^4.1.2",          "chai-as-promised": "^7.1.0",          "chai-bignumber": "^2.0.2", diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index 40c34d2e7..85398e624 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.1.1", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.1.0",          "changes": [              { diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md index d37938a58..98435be19 100644 --- a/packages/sol-resolver/CHANGELOG.md +++ b/packages/sol-resolver/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.1.1 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.1.0 - _December 11, 2018_      * NPMResolver now supports scoped packages (#1311) diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index f6a928356..0163765d9 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/sol-resolver", -    "version": "1.1.0", +    "version": "1.1.1",      "engines": {          "node": ">=6.12"      }, @@ -23,15 +23,15 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "make-promises-safe": "^1.1.0",          "shx": "^0.2.2",          "tslint": "5.11.0",          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6",          "lodash": "^4.17.5"      },      "publishConfig": { diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json index 9897ae6a3..393054465 100644 --- a/packages/sra-spec/CHANGELOG.json +++ b/packages/sra-spec/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.0.13", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.12",          "changes": [              { diff --git a/packages/sra-spec/CHANGELOG.md b/packages/sra-spec/CHANGELOG.md index 0f6aef476..fd673b837 100644 --- a/packages/sra-spec/CHANGELOG.md +++ b/packages/sra-spec/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.0.13 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.0.12 - _December 11, 2018_      * Dependencies updated diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 2983ba044..3a6ee96d3 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/sra-spec", -    "version": "1.0.12", +    "version": "1.0.13",      "engines": {          "node": ">=6.12"      }, @@ -35,11 +35,11 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md",      "dependencies": { -        "@0x/json-schemas": "^2.1.3", +        "@0x/json-schemas": "^2.1.4",          "@loopback/openapi-v3-types": "^0.8.2"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/mocha": "^2.2.42",          "@types/node": "^10.5.3",          "chai": "^4.0.1", diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index f0766e58b..938b2a717 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.1.8", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.1.7",          "changes": [              { diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index b0bef4b0d..002c76395 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.1.8 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.1.7 - _December 11, 2018_      * Dependencies updated diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 8cd29b8e8..90ef6b677 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/subproviders", -    "version": "2.1.7", +    "version": "2.1.8",      "engines": {          "node": ">=6.12"      }, @@ -29,11 +29,11 @@          }      },      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "@0x/assert": "^1.0.20", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "@ledgerhq/hw-app-eth": "^4.3.0",          "@ledgerhq/hw-transport-u2f": "4.24.0",          "@types/eth-lightwallet": "^3.0.0", @@ -43,7 +43,7 @@          "bip39": "^2.5.0",          "bn.js": "^4.11.8",          "eth-lightwallet": "^3.0.1", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-tx": "^1.3.5",          "ethereumjs-util": "^5.1.1",          "ganache-core": "^2.2.1", @@ -54,7 +54,7 @@          "web3-provider-engine": "14.0.6"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/bip39": "^2.4.0",          "@types/bn.js": "^4.11.0",          "@types/ethereumjs-tx": "^1.0.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 454314c86..70d785c74 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@  {      "private": true,      "name": "@0x/testnet-faucets", -    "version": "1.0.59", +    "version": "1.0.60",      "engines": {          "node": ">=6.12"      }, @@ -18,13 +18,13 @@      "author": "Fabio Berger",      "license": "Apache-2.0",      "dependencies": { -        "0x.js": "^2.0.7", -        "@0x/subproviders": "^2.1.7", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "@0x/web3-wrapper": "^3.2.0", +        "0x.js": "^2.0.8", +        "@0x/subproviders": "^2.1.8", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "@0x/web3-wrapper": "^3.2.1",          "body-parser": "^1.17.1", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-tx": "^1.3.5",          "ethereumjs-util": "^5.1.1",          "express": "^4.15.2", @@ -32,7 +32,7 @@          "rollbar": "^0.6.5"      },      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/body-parser": "^1.16.1",          "@types/express": "^4.0.35",          "@types/lodash": "4.14.104", diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json index 9f504216c..0070a5b81 100644 --- a/packages/tslint-config/CHANGELOG.json +++ b/packages/tslint-config/CHANGELOG.json @@ -1,5 +1,15 @@  [      { +        "version": "2.0.0", +        "changes": [ +            { +                "note": "Improve async-suffix rule to check functions too, not just methods", +                "pr": 1425 +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.0.10",          "changes": [              { diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md index f5cacb5d1..3cebb1e95 100644 --- a/packages/tslint-config/CHANGELOG.md +++ b/packages/tslint-config/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.0.0 - _December 13, 2018_ + +    * Improve async-suffix rule to check functions too, not just methods (#1425) +  ## v1.0.10 - _November 9, 2018_      * Dependencies updated diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index 2914f31e2..64ec1e967 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/tslint-config", -    "version": "1.0.10", +    "version": "2.0.0",      "engines": {          "node": ">=6.12"      }, diff --git a/packages/tslint-config/rules/walkers/async_suffix.ts b/packages/tslint-config/rules/walkers/async_suffix.ts index eaec9c5f6..4e12152e8 100644 --- a/packages/tslint-config/rules/walkers/async_suffix.ts +++ b/packages/tslint-config/rules/walkers/async_suffix.ts @@ -3,24 +3,33 @@ import * as Lint from 'tslint';  import * as ts from 'typescript';  export class AsyncSuffixWalker extends Lint.RuleWalker { -    public static FAILURE_STRING = 'async functions must have an Async suffix'; +    public static FAILURE_STRING = 'async functions/methods must have an Async suffix'; +    public visitFunctionDeclaration(node: ts.FunctionDeclaration): void { +        this._visitFunctionOrMethodDeclaration(node); +        super.visitFunctionDeclaration(node); +    }      public visitMethodDeclaration(node: ts.MethodDeclaration): void { -        const methodNameNode = node.name; -        const methodName = methodNameNode.getText(); -        if (!_.isUndefined(node.type)) { -            if (node.type.kind === ts.SyntaxKind.TypeReference) { -                // tslint:disable-next-line:no-unnecessary-type-assertion -                const returnTypeName = (node.type as ts.TypeReferenceNode).typeName.getText(); -                if (returnTypeName === 'Promise' && !methodName.endsWith('Async')) { -                    const failure = this.createFailure( -                        methodNameNode.getStart(), -                        methodNameNode.getWidth(), -                        AsyncSuffixWalker.FAILURE_STRING, -                    ); -                    this.addFailure(failure); +        this._visitFunctionOrMethodDeclaration(node); +        super.visitMethodDeclaration(node); +    } +    private _visitFunctionOrMethodDeclaration(node: ts.MethodDeclaration | ts.FunctionDeclaration): void { +        const nameNode = node.name; +        if (!_.isUndefined(nameNode)) { +            const name = nameNode.getText(); +            if (!_.isUndefined(node.type)) { +                if (node.type.kind === ts.SyntaxKind.TypeReference) { +                    // tslint:disable-next-line:no-unnecessary-type-assertion +                    const returnTypeName = (node.type as ts.TypeReferenceNode).typeName.getText(); +                    if (returnTypeName === 'Promise' && !name.endsWith('Async')) { +                        const failure = this.createFailure( +                            nameNode.getStart(), +                            nameNode.getWidth(), +                            AsyncSuffixWalker.FAILURE_STRING, +                        ); +                        this.addFailure(failure); +                    }                  }              }          } -        super.visitMethodDeclaration(node);      }  } diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 23a317a15..f1cd2f18e 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "1.4.1", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "1.4.0",          "changes": [              { diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index ef8337d76..5170eb4db 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v1.4.1 - _December 13, 2018_ + +    * Dependencies updated +  ## v1.4.0 - _December 11, 2018_      * Add `LengthMismatch` and `LengthGreaterThan3Required` revert reasons (#1224) diff --git a/packages/types/package.json b/packages/types/package.json index 1e2bc5ae8..3c4bb6fe6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/types", -    "version": "1.4.0", +    "version": "1.4.1",      "engines": {          "node": ">=6.12"      }, @@ -23,7 +23,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "make-promises-safe": "^1.1.0",          "shx": "^0.2.2",          "tslint": "5.11.0", @@ -32,7 +32,7 @@      "dependencies": {          "@types/node": "*",          "bignumber.js": "~4.1.0", -        "ethereum-types": "^1.1.3" +        "ethereum-types": "^1.1.4"      },      "publishConfig": {          "access": "public" diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json index 39ef9d77c..fadf5ad14 100644 --- a/packages/typescript-typings/CHANGELOG.json +++ b/packages/typescript-typings/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "3.0.6", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "3.0.5",          "changes": [              { diff --git a/packages/typescript-typings/CHANGELOG.md b/packages/typescript-typings/CHANGELOG.md index 2e8553a91..1663d40af 100644 --- a/packages/typescript-typings/CHANGELOG.md +++ b/packages/typescript-typings/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v3.0.6 - _December 13, 2018_ + +    * Dependencies updated +  ## v3.0.5 - _December 11, 2018_      * Dependencies updated diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index 59e0803eb..c67b660c8 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/typescript-typings", -    "version": "3.0.5", +    "version": "3.0.6",      "engines": {          "node": ">=6.12"      }, @@ -27,7 +27,7 @@          "@types/bn.js": "^4.11.0",          "@types/react": "*",          "bignumber.js": "~4.1.0", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "popper.js": "1.14.3"      },      "devDependencies": { diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 74fce56aa..fe66d3f31 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "2.0.8", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "2.0.7",          "changes": [              { diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 45553430d..c0437392d 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v2.0.8 - _December 13, 2018_ + +    * Dependencies updated +  ## v2.0.7 - _December 11, 2018_      * Optimized ABI Encoder/Decoder. Generates compressed calldata to save gas. Generates human-readable calldata to aid development. diff --git a/packages/utils/package.json b/packages/utils/package.json index 38c729337..a25dc9cff 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/utils", -    "version": "2.0.7", +    "version": "2.0.8",      "engines": {          "node": ">=6.12"      }, @@ -28,7 +28,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/detect-node": "2.0.0",          "@types/lodash": "4.14.104",          "@types/mocha": "^2.2.42", @@ -44,13 +44,13 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/types": "^1.4.0", -        "@0x/typescript-typings": "^3.0.5", +        "@0x/types": "^1.4.1", +        "@0x/typescript-typings": "^3.0.6",          "@types/node": "*",          "abortcontroller-polyfill": "^1.1.9",          "bignumber.js": "~4.1.0",          "detect-node": "2.0.3", -        "ethereum-types": "^1.1.3", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "ethers": "~4.0.4",          "isomorphic-fetch": "^2.2.1", diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index ccbd9ed81..6b76626a9 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,14 @@  [      { +        "version": "3.2.1", +        "changes": [ +            { +                "note": "Dependencies updated" +            } +        ], +        "timestamp": 1544739608 +    }, +    {          "version": "3.2.0",          "changes": [              { diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 94f50fd92..76ca80e69 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.  CHANGELOG +## v3.2.1 - _December 13, 2018_ + +    * Dependencies updated +  ## v3.2.0 - _December 11, 2018_      * Return `value` and `gasPrice` as BigNumbers to avoid loss of precision errors (#1402) diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 09fd184d2..e5af24965 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/web3-wrapper", -    "version": "3.2.0", +    "version": "3.2.1",      "engines": {          "node": ">=6.12"      }, @@ -36,7 +36,7 @@      },      "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",      "devDependencies": { -        "@0x/tslint-config": "^1.0.10", +        "@0x/tslint-config": "^2.0.0",          "@types/ganache-core": "^2.1.0",          "@types/lodash": "4.14.104",          "chai": "^4.0.1", @@ -54,11 +54,11 @@          "typescript": "3.0.1"      },      "dependencies": { -        "@0x/assert": "^1.0.19", -        "@0x/json-schemas": "^2.1.3", -        "@0x/typescript-typings": "^3.0.5", -        "@0x/utils": "^2.0.7", -        "ethereum-types": "^1.1.3", +        "@0x/assert": "^1.0.20", +        "@0x/json-schemas": "^2.1.4", +        "@0x/typescript-typings": "^3.0.6", +        "@0x/utils": "^2.0.8", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "ethers": "~4.0.4",          "lodash": "^4.17.5" diff --git a/packages/website/package.json b/packages/website/package.json index b0b0c8340..0ac4c9db6 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@  {      "name": "@0x/website", -    "version": "0.0.61", +    "version": "0.0.63",      "engines": {          "node": ">=6.12"      }, @@ -20,7 +20,7 @@      "author": "Fabio Berger",      "license": "Apache-2.0",      "dependencies": { -        "@0x/asset-buyer": "^3.0.2", +        "@0x/asset-buyer": "^3.0.4",          "@0x/contract-addresses": "^2.0.0",          "@0x/contract-wrappers": "^4.1.1",          "@0x/json-schemas": "^2.1.2", @@ -42,7 +42,7 @@          "blockies": "^0.0.2",          "bowser": "^1.9.3",          "deep-equal": "^1.0.1", -        "ethereum-types": "^1.1.2", +        "ethereum-types": "^1.1.4",          "ethereumjs-util": "^5.1.1",          "find-versions": "^2.0.0",          "jsonschema": "^1.2.0", diff --git a/packages/website/public/images/developers/tutorials/integrate_0x_instant.svg b/packages/website/public/images/developers/tutorials/integrate_0x_instant.svg new file mode 100644 index 000000000..e9c9278a8 --- /dev/null +++ b/packages/website/public/images/developers/tutorials/integrate_0x_instant.svg @@ -0,0 +1,3 @@ +<svg width="32" height="39" viewBox="0 0 32 39" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M16 1L1 23.242H16L16.0412 38L31 15.7159H16V1Z" stroke="#3289F1" stroke-width="1.5" stroke-miterlimit="10" stroke-linejoin="round"/> +</svg> diff --git a/packages/website/public/index.html b/packages/website/public/index.html index 3f013f128..538eca6d9 100644 --- a/packages/website/public/index.html +++ b/packages/website/public/index.html @@ -23,7 +23,7 @@          <link rel="stylesheet" href="/css/basscss_responsive_type_scale.css" />      </head> -    <body> +    <body style="margin: 0px; min-width: 355px;">          <!-- Heap SDK -->          <script type="text/javascript">              (window.heap = window.heap || []), diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json index 78f29d0f6..2914ffead 100644 --- a/packages/website/translations/english.json +++ b/packages/website/translations/english.json @@ -92,6 +92,9 @@      "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",      "USE_NETWORKED_LIQUIDITY": "use networked liquidity",      "USE_NETWORKED_LIQUIDITY_DESCRIPTION": "Learn how to tap into networked liquidity using the Standard Relayer API", +    "INTEGRATE_0X_INSTANT": "add seamless purchasing of crypto assets to your website or app", +    "INTEGRATE_0X_INSTANT_DESCRIPTION": +        "learn how to use 0x Instant or AssetBuyer to give your users the power of purchasing crypto assets using 0x",      "VIEW_ALL_DOCUMENTATION": "view all documentation",      "SANDBOX": "0x.js sandbox",      "GITHUB": "github", diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index f68d2892f..9dc779e96 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -44,6 +44,14 @@ const TUTORIALS: TutorialInfo[] = [              to: `${WebsitePaths.Wiki}#Find,-Submit,-Fill-Order-From-Relayer`,          },      }, +    { +        iconUrl: '/images/developers/tutorials/integrate_0x_instant.svg', +        description: Key.Integrate0xInstantDescription, +        link: { +            title: Key.Integrate0xInstant, +            to: `${WebsitePaths.Wiki}#Get-Started-With-Instant`, +        }, +    },  ];  const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = { diff --git a/packages/website/ts/pages/instant/fee_percentage_slider.tsx b/packages/website/ts/pages/instant/fee_percentage_slider.tsx index 176240f2e..d76cee58f 100644 --- a/packages/website/ts/pages/instant/fee_percentage_slider.tsx +++ b/packages/website/ts/pages/instant/fee_percentage_slider.tsx @@ -1,23 +1,52 @@  import Slider from 'rc-slider'; -//import 'rc-slider/assets/index.css'; +import 'rc-slider/assets/index.css';  import * as React from 'react'; -import styled from 'styled-components';  import { Text } from 'ts/components/ui/text';  import { colors } from 'ts/style/colors'; +import { injectGlobal } from 'ts/style/theme';  const SliderWithTooltip = (Slider as any).createSliderWithTooltip(Slider);  // tslint:disable-next-line:no-unused-expression +injectGlobal` +    .rc-slider-tooltip-inner { +        box-shadow: none !important; +        background-color: ${colors.white} !important; +        border-radius: 4px !important; +        padding: 3px 12px !important; +        height: auto !important; +        position: relative; +        top: 7px; +        &: after { +            border: solid transparent; +            content: " "; +            height: 0; +            width: 0; +            position: absolute; +            pointer-events: none; +            border-width: 6px; +            bottom: 100%; +            left: 100%; +            border-bottom-color: ${colors.white}; +            margin-left: -60%; +        } +    } +    .rc-slider-disabled { +        background-color: inherit !important; +    } +`;  export interface FeePercentageSliderProps {      value: number; +    isDisabled: boolean;      onChange: (value: number) => void;  }  export class FeePercentageSlider extends React.Component<FeePercentageSliderProps> {      public render(): React.ReactNode {          return ( -            <StyledSlider +            <SliderWithTooltip +                disabled={this.props.isDisabled}                  min={0}                  max={0.05}                  step={0.0025} @@ -46,28 +75,3 @@ export class FeePercentageSlider extends React.Component<FeePercentageSliderProp          return <Text fontColor={colors.black} fontSize="14px" fontWeight={700}>{`${(value * 100).toFixed(2)}%`}</Text>;      };  } - -const StyledSlider = styled(SliderWithTooltip)` -    .rc-slider-tooltip-inner { -        box-shadow: none !important; -        background-color: ${colors.white} !important; -        border-radius: 4px !important; -        padding: 3px 12px !important; -        height: auto !important; -        position: relative; -        top: 7px; -        &:after { -            border: solid transparent; -            content: " "; -            height: 0; -            width: 0; -            position: absolute; -            pointer-events: none; -            border-width: 6px; -            bottom: 100%; -            left: 100%; -            border-bottom-color: ${colors.white}; -            margin-left: -60%; -        } -    } -`; diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index a668681d5..73e248713 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -480,6 +480,8 @@ export enum Key {      OrderBasicsDescription = 'ORDER_BASICS_DESCRIPTION',      UseNetworkedLiquidity = 'USE_NETWORKED_LIQUIDITY',      UseNetworkedLiquidityDescription = 'USE_NETWORKED_LIQUIDITY_DESCRIPTION', +    Integrate0xInstant = 'INTEGRATE_0X_INSTANT', +    Integrate0xInstantDescription = 'INTEGRATE_0X_INSTANT_DESCRIPTION',      ViewAllDocumentation = 'VIEW_ALL_DOCUMENTATION',      Sandbox = 'SANDBOX',      Github = 'GITHUB', @@ -534,7 +534,7 @@    dependencies:      npm-registry-client "7.0.9" -"@babel/code-frame@^7.0.0-beta.35": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":    version "7.0.0"    resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"    dependencies: @@ -584,11 +584,6 @@    version "0.6.6"    resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" -"@emotion/unitless@^0.7.0": -  version "0.7.3" -  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f" -  integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg== -  "@ledgerhq/hw-app-eth@^4.3.0":    version "4.7.3"    resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.7.3.tgz#d352e19658ae296532e522c53c8ec2a1a77b64e5" @@ -1203,33 +1198,6 @@      call-me-maybe "^1.0.1"      glob-to-regexp "^0.3.0" -"@reach/component-component@^0.1.1": -  version "0.1.1" -  resolved "https://registry.yarnpkg.com/@reach/component-component/-/component-component-0.1.1.tgz#62ea2ec290da32f5e3a9872fb51f9a3ae4370cc4" -  integrity sha512-4HxyyOLo/nDg0LlgYvzgqpTGaxqKmrZB8/y5wWhtyvGzgKAb1DJzSnYRaFsgGGgkQAQmhwPXKZ0H/rOAkxXJ8Q== - -"@reach/dialog@^0.1.2": -  version "0.1.2" -  resolved "https://registry.yarnpkg.com/@reach/dialog/-/dialog-0.1.2.tgz#46a3639c01928e125110fd5ccb753281172e844d" -  integrity sha512-aaBS2a4ZNKGpqsjCdZukYhjf1x75sZ1lQrYg9mJq21Nfz9kk0Yx6zn4LR7ZYxgqkGj5/CQOSciGuUPF+Z8k9nA== -  dependencies: -    "@reach/component-component" "^0.1.1" -    "@reach/portal" "^0.1.1" -    "@reach/utils" "^0.1.2" -    focus-trap "^3.0.0" - -"@reach/portal@^0.1.1": -  version "0.1.1" -  resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.1.1.tgz#94f3f9b999c5a0dfb819309912ec23e36807e70b" -  integrity sha512-AWsOH2TLfetlUzw3wbpy6n8trnuFI7N/HB2jYjrBRP5IbG/PmgrVQiL/HFP/OsCbbOo0rK7AsKnG7qyOf0r4Tg== -  dependencies: -    "@reach/component-component" "^0.1.1" - -"@reach/utils@^0.1.2": -  version "0.1.2" -  resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.1.2.tgz#72f547b5c9b0401a56de303d9e508abf6d3fa56a" -  integrity sha512-HpDR5BeCApr3HufQtpg0P5b9sl0S66zikZSMtC/2jZBvrDzjVaT9O8PbKTQqW0PdkMNrnBkX1UtlrrM1TN3/Og== -  "@samverschueren/stream-to-observable@^0.3.0":    version "0.3.0"    resolved "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -1263,11 +1231,6 @@    version "0.4.1"    resolved "https://registry.yarnpkg.com/@types/accounting/-/accounting-0.4.1.tgz#865d9f5694fd7c438fba34eb4bc82eec6f34cdd5" -"@types/anymatch@*": -  version "1.3.0" -  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz#d1d55958d1fccc5527d4aba29fc9c4b942f563ff" -  integrity sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ== -  "@types/axios@^0.14.0":    version "0.14.0"    resolved "https://registry.yarnpkg.com/@types/axios/-/axios-0.14.0.tgz#ec2300fbe7d7dddd7eb9d3abf87999964cafce46" @@ -1353,8 +1316,8 @@      bignumber.js "7.2.1"  "@types/ethereumjs-abi@^0.6.0": -  version "0.6.0" -  resolved "https://registry.yarnpkg.com/@types/ethereumjs-abi/-/ethereumjs-abi-0.6.0.tgz#72d21083a36d9288821b62905e04b15e0c12175d" +  version "0.6.1" +  resolved "https://registry.yarnpkg.com/@types/ethereumjs-abi/-/ethereumjs-abi-0.6.1.tgz#68dad80888a6e9f12b04f85adcb9cad2cb825e5c"    dependencies:      "@types/node" "*" @@ -1447,7 +1410,7 @@  "@types/js-combinatorics@^0.5.29":    version "0.5.29" -  resolved "https://registry.yarnpkg.com/@types/js-combinatorics/-/js-combinatorics-0.5.29.tgz#47a7819a0b6925b6dc4bd2c2278a7e6329b29387" +  resolved "http://registry.npmjs.org/@types/js-combinatorics/-/js-combinatorics-0.5.29.tgz#47a7819a0b6925b6dc4bd2c2278a7e6329b29387"  "@types/jsonschema@^1.1.1":    version "1.1.1" @@ -1622,21 +1585,6 @@    dependencies:      "@types/react" "*" -"@types/react-lazyload@^2.3.1": -  version "2.3.1" -  resolved "https://registry.yarnpkg.com/@types/react-lazyload/-/react-lazyload-2.3.1.tgz#6a1814432f668081ff693abfa8e09bff09aa3649" -  integrity sha512-A6JP3TWmWP7I7V1yIme0yIZGHj+6Lhf9kos3A6eRw9ADy1eK3poP3XC0o6KBWvBHZbHJXoZAAni+mX6GE4dMKg== -  dependencies: -    "@types/react" "*" - -"@types/react-loadable@^5.4.2": -  version "5.4.2" -  resolved "https://registry.yarnpkg.com/@types/react-loadable/-/react-loadable-5.4.2.tgz#087ead218ee0494c44e41fbdec7477b0ea4b7c86" -  integrity sha512-F9hv1ErL1zRch8u6VNuxqXSvSr/WdlfpLhU1UcipHRWg1NXZ8pq2Dh7Uqkp+11ex9wocu/F26Edw4Hn318k6cA== -  dependencies: -    "@types/react" "*" -    "@types/webpack" "*" -  "@types/react-redux@^4.4.37":    version "4.4.47"    resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-4.4.47.tgz#12af1677116e08d413fe2620d0a85560c8a0536e" @@ -1702,14 +1650,6 @@      "@types/prop-types" "*"      csstype "^2.2.0" -"@types/react@^16.7.7": -  version "16.7.13" -  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.13.tgz#d2369ae78377356d42fb54275d30218e84f2247a" -  integrity sha512-WhqrQLAE9z65hfcvWqZfR6qUtIazFRyb8LXqHo8440R53dAQqNkt2OlVJ3FXwqOwAXXg4nfYxt0qgBvE18o5XA== -  dependencies: -    "@types/prop-types" "*" -    csstype "^2.2.0" -  "@types/redux@^3.6.0":    version "3.6.0"    resolved "https://registry.yarnpkg.com/@types/redux/-/redux-3.6.0.tgz#f1ebe1e5411518072e4fdfca5c76e16e74c1399a" @@ -1771,31 +1711,10 @@      "@types/node" "*"      "@types/react" "*" -"@types/styled-components@^4.1.1": -  version "4.1.3" -  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.1.3.tgz#8d33a8e782e795c1da411b71a0e911a82968dd95" -  integrity sha512-KufaiYcIbfm9z5ikqCJuhjXPCfTdv1GXLe4Ad1Qb12LjeE8FWocuwqMnIgYMMkflsqVAIv7xckcK5eU1l2qHdA== -  dependencies: -    "@types/node" "*" -    "@types/react" "*" -    csstype "^2.2.0" - -"@types/tapable@*": -  version "1.0.4" -  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370" -  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ== -  "@types/tmp@^0.0.33":    version "0.0.33"    resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.33.tgz#1073c4bc824754ae3d10cfab88ab0237ba964e4d" -"@types/uglify-js@*": -  version "3.0.4" -  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082" -  integrity sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ== -  dependencies: -    source-map "^0.6.1" -  "@types/uuid@^3.4.2", "@types/uuid@^3.4.3":    version "3.4.3"    resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.3.tgz#121ace265f5569ce40f4f6d0ff78a338c732a754" @@ -1812,17 +1731,6 @@    dependencies:      "@types/ethereum-protocol" "*" -"@types/webpack@*": -  version "4.4.21" -  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.21.tgz#1a80de6d3e465f35067dd2f4533bf6e04c2e7187" -  integrity sha512-QJfA6GeLSlnx8yyrEQ7fNLYj1MYKzqHlo89skOwnKG4nblpwAyXe9Gcm/eTz/BpX0vBEtiehrSv9b/W9TMkhKg== -  dependencies: -    "@types/anymatch" "*" -    "@types/node" "*" -    "@types/tapable" "*" -    "@types/uglify-js" "*" -    source-map "^0.6.0" -  "@types/websocket@^0.0.39":    version "0.0.39"    resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-0.0.39.tgz#aa971e24f9c1455fe2a57ee3e69c7d395016b12a" @@ -2062,29 +1970,19 @@ acorn-globals@^4.1.0:      acorn "^6.0.1"      acorn-walk "^6.0.1" -acorn-jsx@^3.0.0: -  version "3.0.1" -  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" -  dependencies: -    acorn "^3.0.4" +acorn-jsx@^5.0.0: +  version "5.0.1" +  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"  acorn-walk@^6.0.1:    version "6.1.0"    resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc" -acorn@^3.0.4: -  version "3.3.0" -  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -  acorn@^5.0.0:    version "5.5.3"    resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" -acorn@^5.5.0: -  version "5.7.1" -  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" - -acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3: +acorn@^5.5.3, acorn@^5.6.2:    version "5.7.3"    resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" @@ -2092,6 +1990,10 @@ acorn@^6.0.1:    version "6.0.2"    resolved "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4" +acorn@^6.0.2: +  version "6.0.4" +  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754" +  add-dom-event-listener@^1.1.0:    version "1.1.0"    resolved "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310" @@ -2122,10 +2024,6 @@ ajv-errors@^1.0.0:    version "1.0.0"    resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59" -ajv-keywords@^2.1.0: -  version "2.1.1" -  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" -  ajv-keywords@^3.1.0:    version "3.1.0"    resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" @@ -2137,7 +2035,7 @@ ajv@^4.9.1:      co "^4.6.0"      json-stable-stringify "^1.0.1" -ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: +ajv@^5.1.0, ajv@^5.3.0:    version "5.5.2"    resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"    dependencies: @@ -2155,6 +2053,15 @@ ajv@^6.1.0:      json-schema-traverse "^0.3.0"      uri-js "^3.0.2" +ajv@^6.5.3: +  version "6.5.5" +  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1" +  dependencies: +    fast-deep-equal "^2.0.1" +    fast-json-stable-stringify "^2.0.0" +    json-schema-traverse "^0.4.1" +    uri-js "^4.2.2" +  align-text@^0.1.1, align-text@^0.1.3:    version "0.1.4"    resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -2229,9 +2136,9 @@ ansi@^0.3.0, ansi@~0.3.1:    version "0.3.1"    resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" -antlr4@4.7.0: -  version "4.7.0" -  resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.0.tgz#297f956ddc06f83397fc0990ecf2e0cf20bfbbee" +antlr4@4.7.1: +  version "4.7.1" +  resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773"  any-observable@^0.3.0:    version "0.3.0" @@ -2656,15 +2563,6 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:      babel-runtime "^6.22.0"      babel-types "^6.24.1" -babel-helper-builder-react-jsx@^6.24.1: -  version "6.26.0" -  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" -  integrity sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA= -  dependencies: -    babel-runtime "^6.26.0" -    babel-types "^6.26.0" -    esutils "^2.0.2" -  babel-helper-call-delegate@^6.24.1:    version "6.24.1"    resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" @@ -2790,11 +2688,6 @@ babel-plugin-jest-hoist@^23.2.0:    version "23.2.0"    resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167" -babel-plugin-react-svg@^2.1.0: -  version "2.1.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-react-svg/-/babel-plugin-react-svg-2.1.0.tgz#169eeba1a20fa2dee3a71ff38eedd63d08e69487" -  integrity sha512-dHhDj5o4TEdrGSIzWQvTthZsEGCWGRKzSd+zO0xl8ie0zMf4to5nF64Cyu2zfM0mfB9BGRYQLE3YQliv9c+gPA== -  "babel-plugin-styled-components@>= 1":    version "1.8.0"    resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.8.0.tgz#9dd054c8e86825203449a852a5746f29f2dab857" @@ -2810,17 +2703,7 @@ babel-plugin-syntax-exponentiation-operator@^6.8.0:    version "6.13.0"    resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" -babel-plugin-syntax-flow@^6.18.0: -  version "6.18.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" -  integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0= - -babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: -  version "6.18.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" -  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - -babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0: +babel-plugin-syntax-object-rest-spread@^6.13.0:    version "6.13.0"    resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" @@ -3012,54 +2895,6 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:      babel-plugin-syntax-exponentiation-operator "^6.8.0"      babel-runtime "^6.22.0" -babel-plugin-transform-flow-strip-types@^6.22.0: -  version "6.22.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" -  integrity sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988= -  dependencies: -    babel-plugin-syntax-flow "^6.18.0" -    babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.26.0: -  version "6.26.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" -  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY= -  dependencies: -    babel-plugin-syntax-object-rest-spread "^6.8.0" -    babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.23.0: -  version "6.25.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" -  integrity sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE= -  dependencies: -    babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: -  version "6.22.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" -  integrity sha1-322AqdomEqEh5t3XVYvL7PBuY24= -  dependencies: -    babel-plugin-syntax-jsx "^6.8.0" -    babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: -  version "6.22.0" -  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" -  integrity sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY= -  dependencies: -    babel-plugin-syntax-jsx "^6.8.0" -    babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: -  version "6.24.1" -  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" -  integrity sha1-hAoCjn30YN/DotKfDA2R9jduZqM= -  dependencies: -    babel-helper-builder-react-jsx "^6.24.1" -    babel-plugin-syntax-jsx "^6.8.0" -    babel-runtime "^6.22.0" -  babel-plugin-transform-regenerator@^6.22.0:    version "6.26.0"    resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" @@ -3108,13 +2943,6 @@ babel-preset-env@^1.3.2:      invariant "^2.2.2"      semver "^5.3.0" -babel-preset-flow@^6.23.0: -  version "6.23.0" -  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" -  integrity sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0= -  dependencies: -    babel-plugin-transform-flow-strip-types "^6.22.0" -  babel-preset-jest@^23.2.0:    version "23.2.0"    resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46" @@ -3122,18 +2950,6 @@ babel-preset-jest@^23.2.0:      babel-plugin-jest-hoist "^23.2.0"      babel-plugin-syntax-object-rest-spread "^6.13.0" -babel-preset-react@^6.24.1: -  version "6.24.1" -  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" -  integrity sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A= -  dependencies: -    babel-plugin-syntax-jsx "^6.3.13" -    babel-plugin-transform-react-display-name "^6.23.0" -    babel-plugin-transform-react-jsx "^6.24.1" -    babel-plugin-transform-react-jsx-self "^6.22.0" -    babel-plugin-transform-react-jsx-source "^6.22.0" -    babel-preset-flow "^6.23.0" -  babel-register@^6.26.0:    version "6.26.0"    resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" @@ -3319,16 +3135,6 @@ beeper@^1.0.0:    version "1.1.1"    resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" -bfj@^6.1.1: -  version "6.1.1" -  resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz#05a3b7784fbd72cfa3c22e56002ef99336516c48" -  integrity sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ== -  dependencies: -    bluebird "^3.5.1" -    check-types "^7.3.0" -    hoopy "^0.1.2" -    tryer "^1.0.0" -  big.js@^3.1.3:    version "3.2.0"    resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" @@ -3473,22 +3279,6 @@ body-parser@1.18.2, body-parser@^1.16.0, body-parser@^1.17.1:      raw-body "2.3.2"      type-is "~1.6.15" -body-parser@1.18.3: -  version "1.18.3" -  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" -  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ= -  dependencies: -    bytes "3.0.0" -    content-type "~1.0.4" -    debug "2.6.9" -    depd "~1.1.2" -    http-errors "~1.6.3" -    iconv-lite "0.4.23" -    on-finished "~2.3.0" -    qs "6.5.2" -    raw-body "2.3.3" -    type-is "~1.6.16" -  bonjour@^3.5.0:    version "3.5.0"    resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" @@ -3908,7 +3698,7 @@ caller-path@^0.1.0:  callsites@^0.2.0:    version "0.2.0" -  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" +  resolved "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"  callsites@^2.0.0:    version "2.0.0" @@ -4100,11 +3890,6 @@ check-error@^1.0.1, check-error@^1.0.2:    version "1.0.2"    resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" -check-types@^7.3.0: -  version "7.4.0" -  resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4" -  integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg== -  checkpoint-store@^1.1.0:    version "1.1.0"    resolved "https://registry.yarnpkg.com/checkpoint-store/-/checkpoint-store-1.1.0.tgz#04e4cb516b91433893581e6d4601a78e9552ea06" @@ -4441,7 +4226,11 @@ commander@2.15.1, commander@^2.12.1, commander@^2.8.1:    version "2.15.1"    resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" -commander@^2.15.1, commander@^2.18.0: +commander@2.18.0: +  version "2.18.0" +  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970" + +commander@^2.15.1:    version "2.19.0"    resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -4876,7 +4665,7 @@ cross-spawn@^4, cross-spawn@^4.0.0:      lru-cache "^4.0.1"      which "^1.2.9" -cross-spawn@^5.0.1, cross-spawn@^5.1.0: +cross-spawn@^5.0.1:    version "5.1.0"    resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"    dependencies: @@ -5189,6 +4978,12 @@ debug@^3.2.5:    dependencies:      ms "^2.1.1" +debug@^4.0.1: +  version "4.1.0" +  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87" +  dependencies: +    ms "^2.1.1" +  debuglog@^1.0.1:    version "1.0.1"    resolved "http://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -5379,18 +5174,6 @@ defined@^1.0.0, defined@~1.0.0:    version "1.0.0"    resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" -del@^2.0.2: -  version "2.2.2" -  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" -  dependencies: -    globby "^5.0.0" -    is-path-cwd "^1.0.0" -    is-path-in-cwd "^1.0.0" -    object-assign "^4.0.1" -    pify "^2.0.0" -    pinkie-promise "^2.0.0" -    rimraf "^2.2.8" -  del@^3.0.0:    version "3.0.0"    resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" @@ -5457,11 +5240,6 @@ des.js@^1.0.0:      inherits "^2.0.1"      minimalistic-assert "^1.0.0" -desandro-matches-selector@^2.0.0: -  version "2.0.2" -  resolved "https://registry.yarnpkg.com/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz#717beed4dc13e7d8f3762f707a6d58a6774218e1" -  integrity sha1-cXvu1NwT59jzdi9wem1YpndCGOE= -  destroy@~1.0.4:    version "1.0.4"    resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -5675,8 +5453,7 @@ dot-prop@^4.1.0, dot-prop@^4.2.0:  dotenv-cli@^1.4.0:    version "1.4.0" -  resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-1.4.0.tgz#e8e80830ed88b48a03b5eb7ec26147ca717f7409" -  integrity sha1-6OgIMO2ItIoDtet+wmFHynF/dAk= +  resolved "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-1.4.0.tgz#e8e80830ed88b48a03b5eb7ec26147ca717f7409"    dependencies:      cross-spawn "^4.0.0"      dotenv "^4.0.0" @@ -5744,11 +5521,6 @@ ee-first@1.1.1:    version "1.1.1"    resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -ejs@^2.6.1: -  version "2.6.1" -  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" -  integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== -  electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:    version "1.3.42"    resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" @@ -5994,13 +5766,6 @@ escodegen@^1.9.1:    optionalDependencies:      source-map "~0.6.1" -eslint-scope@^3.7.1: -  version "3.7.1" -  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" -  dependencies: -    esrecurse "^4.1.0" -    estraverse "^4.1.1" -  eslint-scope@^4.0.0:    version "4.0.0"    resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" @@ -6008,59 +5773,70 @@ eslint-scope@^4.0.0:      esrecurse "^4.1.0"      estraverse "^4.1.1" +eslint-utils@^1.3.1: +  version "1.3.1" +  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" +  eslint-visitor-keys@^1.0.0:    version "1.0.0"    resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@^4.19.1: -  version "4.19.1" -  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" +eslint@^5.6.0: +  version "5.9.0" +  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz#b234b6d15ef84b5849c6de2af43195a2d59d408e"    dependencies: -    ajv "^5.3.0" -    babel-code-frame "^6.22.0" +    "@babel/code-frame" "^7.0.0" +    ajv "^6.5.3"      chalk "^2.1.0" -    concat-stream "^1.6.0" -    cross-spawn "^5.1.0" -    debug "^3.1.0" +    cross-spawn "^6.0.5" +    debug "^4.0.1"      doctrine "^2.1.0" -    eslint-scope "^3.7.1" +    eslint-scope "^4.0.0" +    eslint-utils "^1.3.1"      eslint-visitor-keys "^1.0.0" -    espree "^3.5.4" -    esquery "^1.0.0" +    espree "^4.0.0" +    esquery "^1.0.1"      esutils "^2.0.2"      file-entry-cache "^2.0.0"      functional-red-black-tree "^1.0.1"      glob "^7.1.2" -    globals "^11.0.1" -    ignore "^3.3.3" +    globals "^11.7.0" +    ignore "^4.0.6"      imurmurhash "^0.1.4" -    inquirer "^3.0.6" -    is-resolvable "^1.0.0" -    js-yaml "^3.9.1" +    inquirer "^6.1.0" +    is-resolvable "^1.1.0" +    js-yaml "^3.12.0"      json-stable-stringify-without-jsonify "^1.0.1"      levn "^0.3.0" -    lodash "^4.17.4" -    minimatch "^3.0.2" +    lodash "^4.17.5" +    minimatch "^3.0.4"      mkdirp "^0.5.1"      natural-compare "^1.4.0"      optionator "^0.8.2"      path-is-inside "^1.0.2"      pluralize "^7.0.0"      progress "^2.0.0" -    regexpp "^1.0.1" +    regexpp "^2.0.1"      require-uncached "^1.0.3" -    semver "^5.3.0" +    semver "^5.5.1"      strip-ansi "^4.0.0" -    strip-json-comments "~2.0.1" -    table "4.0.2" -    text-table "~0.2.0" +    strip-json-comments "^2.0.1" +    table "^5.0.2" +    text-table "^0.2.0" -espree@^3.5.4: -  version "3.5.4" -  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" +espree@^4.0.0: +  version "4.1.0" +  resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"    dependencies: -    acorn "^5.5.0" -    acorn-jsx "^3.0.0" +    acorn "^6.0.2" +    acorn-jsx "^5.0.0" +    eslint-visitor-keys "^1.0.0" + +esprima-extract-comments@^1.0.1: +  version "1.1.0" +  resolved "https://registry.yarnpkg.com/esprima-extract-comments/-/esprima-extract-comments-1.1.0.tgz#0dacab567a5900240de6d344cf18c33617becbc9" +  dependencies: +    esprima "^4.0.0"  esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:    version "2.7.3" @@ -6074,7 +5850,7 @@ esprima@^4.0.0:    version "4.0.0"    resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" -esquery@^1.0.0: +esquery@^1.0.1:    version "1.0.1"    resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"    dependencies: @@ -6436,11 +6212,6 @@ ethjs-util@^0.1.3:      is-hex-prefixed "1.0.0"      strip-hex-prefix "1.0.0" -ev-emitter@^1.0.0, ev-emitter@^1.0.1, ev-emitter@^1.0.2: -  version "1.1.1" -  resolved "https://registry.yarnpkg.com/ev-emitter/-/ev-emitter-1.1.1.tgz#8f18b0ce5c76a5d18017f71c0a795c65b9138f2a" -  integrity sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q== -  event-stream@~3.3.0:    version "3.3.4"    resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -6636,42 +6407,6 @@ express@^4.14.0, express@^4.15.2, express@^4.16.2:      utils-merge "1.0.1"      vary "~1.1.2" -express@^4.16.3: -  version "4.16.4" -  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" -  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg== -  dependencies: -    accepts "~1.3.5" -    array-flatten "1.1.1" -    body-parser "1.18.3" -    content-disposition "0.5.2" -    content-type "~1.0.4" -    cookie "0.3.1" -    cookie-signature "1.0.6" -    debug "2.6.9" -    depd "~1.1.2" -    encodeurl "~1.0.2" -    escape-html "~1.0.3" -    etag "~1.8.1" -    finalhandler "1.1.1" -    fresh "0.5.2" -    merge-descriptors "1.0.1" -    methods "~1.1.2" -    on-finished "~2.3.0" -    parseurl "~1.3.2" -    path-to-regexp "0.1.7" -    proxy-addr "~2.0.4" -    qs "6.5.2" -    range-parser "~1.2.0" -    safe-buffer "5.1.2" -    send "0.16.2" -    serve-static "1.13.2" -    setprototypeof "1.1.0" -    statuses "~1.4.0" -    type-is "~1.6.16" -    utils-merge "1.0.1" -    vary "~1.1.2" -  extend-shallow@^2.0.1:    version "2.0.1"    resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -6728,6 +6463,13 @@ extglob@^2.0.4:      snapdragon "^0.8.1"      to-regex "^3.0.1" +extract-comments@^1.0.0: +  version "1.0.0" +  resolved "https://registry.yarnpkg.com/extract-comments/-/extract-comments-1.0.0.tgz#ad4e640704d8a9a124faf8776b47735ff092a593" +  dependencies: +    esprima-extract-comments "^1.0.1" +    parse-code-context "^0.2.2" +  extsprintf@1.3.0:    version "1.3.0"    resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -6758,6 +6500,14 @@ fast-deep-equal@^1.0.0:    version "1.1.0"    resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" +fast-deep-equal@^2.0.1: +  version "2.0.1" +  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" + +fast-diff@^1.1.2: +  version "1.2.0" +  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" +  fast-glob@^2.0.2:    version "2.2.1"    resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.1.tgz#686c2345be88f3741e174add0be6f2e5b6078889" @@ -6816,19 +6566,6 @@ fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.5:      setimmediate "^1.0.5"      ua-parser-js "^0.7.9" -fbjs@^0.8.12: -  version "0.8.17" -  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" -  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= -  dependencies: -    core-js "^1.0.0" -    isomorphic-fetch "^2.1.1" -    loose-envify "^1.0.0" -    object-assign "^4.1.0" -    promise "^7.1.1" -    setimmediate "^1.0.5" -    ua-parser-js "^0.7.18" -  fd-slicer@~1.0.1:    version "1.0.1"    resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" @@ -6900,11 +6637,6 @@ fileset@^2.0.2:      glob "^7.0.3"      minimatch "^3.0.3" -filesize@^3.6.1: -  version "3.6.1" -  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" -  integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== -  fill-range@^2.1.0:    version "2.2.3"    resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" @@ -7019,42 +6751,23 @@ first-chunk-stream@^1.0.0:    version "1.0.0"    resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" -fizzy-ui-utils@^2.0.0: -  version "2.0.7" -  resolved "https://registry.yarnpkg.com/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz#7df45dcc4eb374a08b65d39bb9a4beedf7330505" -  integrity sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg== -  dependencies: -    desandro-matches-selector "^2.0.0" -  flagged-respawn@^1.0.0:    version "1.0.0"    resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"  flat-cache@^1.2.1: -  version "1.3.0" -  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" +  version "1.3.4" +  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"    dependencies:      circular-json "^0.3.1" -    del "^2.0.2"      graceful-fs "^4.1.2" +    rimraf "~2.6.2"      write "^0.2.1"  flatten@^1.0.2:    version "1.0.2"    resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -flickity@^2.1.1: -  version "2.1.2" -  resolved "https://registry.yarnpkg.com/flickity/-/flickity-2.1.2.tgz#f1be68a75c8d8d8d6df68fb2a49f358268279bd0" -  integrity sha512-6IBJjkfCQ8yG6pah9rA9k4NoA9txuIf9+b3V67y70FdZK0icponlJEqseqLKuram0odKrv9ryjrBHQHgMkFfZA== -  dependencies: -    desandro-matches-selector "^2.0.0" -    ev-emitter "^1.0.2" -    fizzy-ui-utils "^2.0.0" -    get-size "^2.0.0" -    tap-listener "^2.0.0" -    unidragger "^2.3.0" -  flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:    version "1.0.3"    resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd" @@ -7062,14 +6775,6 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:      inherits "^2.0.1"      readable-stream "^2.0.4" -focus-trap@^3.0.0: -  version "3.0.0" -  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-3.0.0.tgz#4d2ee044ae66bf7eb6ebc6c93bd7a1039481d7dc" -  integrity sha512-jTFblf0tLWbleGjj2JZsAKbgtZTdL1uC48L8FcmSDl4c2vDoU4NycN1kgV5vJhuq1mxNFkw7uWZ1JAGlINWvyw== -  dependencies: -    tabbable "^3.1.0" -    xtend "^4.0.1" -  follow-redirects@^1.3.0:    version "1.5.8"    resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1" @@ -7419,11 +7124,6 @@ get-port@^3.2.0:    version "3.2.0"    resolved "http://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" -get-size@^2.0.0: -  version "2.0.3" -  resolved "https://registry.yarnpkg.com/get-size/-/get-size-2.0.3.tgz#54a1d0256b20ea7ac646516756202769941ad2ef" -  integrity sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q== -  get-stdin@^4.0.1:    version "4.0.1"    resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -7599,6 +7299,17 @@ glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo      once "^1.3.0"      path-is-absolute "^1.0.0" +glob@7.1.3, glob@^7.1.3: +  version "7.1.3" +  resolved "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" +  dependencies: +    fs.realpath "^1.0.0" +    inflight "^1.0.4" +    inherits "2" +    minimatch "^3.0.4" +    once "^1.3.0" +    path-is-absolute "^1.0.0" +  glob@^4.3.1:    version "4.5.3"    resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" @@ -7618,17 +7329,6 @@ glob@^5.0.15:      once "^1.3.0"      path-is-absolute "^1.0.0" -glob@^7.1.3: -  version "7.1.3" -  resolved "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" -  dependencies: -    fs.realpath "^1.0.0" -    inflight "^1.0.4" -    inherits "2" -    minimatch "^3.0.4" -    once "^1.3.0" -    path-is-absolute "^1.0.0" -  glob@~3.1.21:    version "3.1.21"    resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" @@ -7672,25 +7372,14 @@ global@^4.3.0, global@~4.3.0:      min-document "^2.19.0"      process "~0.5.1" -globals@^11.0.1: -  version "11.7.0" -  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673" +globals@^11.7.0: +  version "11.9.0" +  resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"  globals@^9.18.0:    version "9.18.0"    resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" -globby@^5.0.0: -  version "5.0.0" -  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" -  dependencies: -    array-union "^1.0.1" -    arrify "^1.0.0" -    glob "^7.0.3" -    object-assign "^4.0.1" -    pify "^2.0.0" -    pinkie-promise "^2.0.0" -  globby@^6.1.0:    version "6.1.0"    resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -7856,14 +7545,6 @@ gzip-size@^4.0.0:      duplexer "^0.1.1"      pify "^3.0.0" -gzip-size@^5.0.0: -  version "5.0.0" -  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80" -  integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA== -  dependencies: -    duplexer "^0.1.1" -    pify "^3.0.0" -  handle-thing@^1.2.5:    version "1.2.5"    resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" @@ -8120,11 +7801,6 @@ homedir-polyfill@^1.0.1:    dependencies:      parse-passwd "^1.0.0" -hoopy@^0.1.2: -  version "0.1.4" -  resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" -  integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== -  hosted-git-info@^2.1.4:    version "2.6.0"    resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" @@ -8184,7 +7860,7 @@ http-errors@1.6.2:      setprototypeof "1.0.3"      statuses ">= 1.3.1 < 2" -http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: +http-errors@~1.6.2:    version "1.6.3"    resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"    dependencies: @@ -8283,12 +7959,6 @@ iconv-lite@0.4.19:    version "0.4.19"    resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" -iconv-lite@0.4.23, iconv-lite@^0.4.4: -  version "0.4.23" -  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" -  dependencies: -    safer-buffer ">= 2.1.2 < 3" -  iconv-lite@0.4.24, iconv-lite@^0.4.24:    version "0.4.24"    resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -8301,6 +7971,12 @@ iconv-lite@^0.4.17, iconv-lite@~0.4.13:    dependencies:      safer-buffer "^2.1.0" +iconv-lite@^0.4.4: +  version "0.4.23" +  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" +  dependencies: +    safer-buffer ">= 2.1.2 < 3" +  icss-replace-symbols@^1.1.0:    version "1.1.0"    resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -8327,25 +8003,18 @@ ignore-walk@^3.0.1:    dependencies:      minimatch "^3.0.4" -ignore@^3.3.3, ignore@^3.3.7: -  version "3.3.10" -  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" -  ignore@^3.3.5:    version "3.3.7"    resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" +ignore@^4.0.6: +  version "4.0.6" +  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" +  image-size@~0.5.0:    version "0.5.5"    resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" -imagesloaded@^4.1.3: -  version "4.1.4" -  resolved "https://registry.yarnpkg.com/imagesloaded/-/imagesloaded-4.1.4.tgz#1376efcd162bb768c34c3727ac89cc04051f3cc7" -  integrity sha512-ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA== -  dependencies: -    ev-emitter "^1.0.0" -  immediate@^3.2.3:    version "3.2.3"    resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c" @@ -8456,7 +8125,7 @@ inquirer@^0.8.2:      rx "^2.4.3"      through "^2.3.6" -inquirer@^3.0.6, inquirer@^3.3.0: +inquirer@^3.3.0:    version "3.3.0"    resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"    dependencies: @@ -8493,7 +8162,7 @@ inquirer@^5.1.0:      strip-ansi "^4.0.0"      through "^2.3.6" -inquirer@^6.2.0: +inquirer@^6.1.0, inquirer@^6.2.0:    version "6.2.0"    resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"    dependencies: @@ -8548,11 +8217,6 @@ ipaddr.js@1.6.0:    version "1.6.0"    resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b" -ipaddr.js@1.8.0: -  version "1.8.0" -  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" -  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4= -  ipaddr.js@^1.5.2:    version "1.8.1"    resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427" @@ -8878,7 +8542,7 @@ is-relative@^1.0.0:    dependencies:      is-unc-path "^1.0.0" -is-resolvable@^1.0.0: +is-resolvable@^1.1.0:    version "1.1.0"    resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -9434,8 +9098,8 @@ js-base64@^2.1.9:    resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"  js-combinatorics@^0.5.3: -  version "0.5.3" -  resolved "https://registry.yarnpkg.com/js-combinatorics/-/js-combinatorics-0.5.3.tgz#5da5a1c4632ec59fdf8d49dccfe59ef088122b15" +  version "0.5.4" +  resolved "https://registry.yarnpkg.com/js-combinatorics/-/js-combinatorics-0.5.4.tgz#c92916b8f8171b64ecd7c4435b72cfabc803c756"  js-scrypt@^0.2.0:    version "0.2.0" @@ -9474,7 +9138,7 @@ js-yaml@3.x, js-yaml@^3.4.2, js-yaml@^3.6.1, js-yaml@^3.7.0:      argparse "^1.0.7"      esprima "^4.0.0" -js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1: +js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.9.0:    version "3.12.0"    resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"    dependencies: @@ -9574,6 +9238,10 @@ json-schema-traverse@^0.3.0:    version "0.3.1"    resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" +json-schema-traverse@^0.4.1: +  version "0.4.1" +  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" +  json-schema@0.2.3:    version "0.2.3"    resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -10246,11 +9914,6 @@ lodash.isequal@^4.0.0, lodash.isequal@^4.5.0:    version "4.5.0"    resolved "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" -lodash.isplainobject@^4.0.6: -  version "4.0.6" -  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" -  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= -  lodash.keys@^3.0.0, lodash.keys@^3.1.2:    version "3.1.2"    resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" @@ -10351,7 +10014,7 @@ lodash@^3.3.1, lodash@^3.6.0, lodash@^3.7.0:    version "3.10.1"    resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0: +lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11:    version "4.17.11"    resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -11746,11 +11409,6 @@ openapi3-ts@^0.11.0:    version "0.11.0"    resolved "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-0.11.0.tgz#8e4c51ad8d54f8f2516b895e4ce8c01550cd4854" -opener@^1.5.1: -  version "1.5.1" -  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" -  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== -  opn-cli@^3.1.0:    version "3.1.0"    resolved "https://registry.yarnpkg.com/opn-cli/-/opn-cli-3.1.0.tgz#f819ae6cae0b411bd0149b8560fe6c88adad20f8" @@ -12021,6 +11679,10 @@ parse-asn1@^5.0.0:      evp_bytestokey "^1.0.0"      pbkdf2 "^3.0.3" +parse-code-context@^0.2.2: +  version "0.2.2" +  resolved "https://registry.yarnpkg.com/parse-code-context/-/parse-code-context-0.2.2.tgz#144b8afb7219482d7e88c1eb6a765596f3a6ac0d" +  parse-entities@^1.1.0:    version "1.1.1"    resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890" @@ -12652,13 +12314,27 @@ preserve@^0.2.0:    version "0.2.0"    resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" +prettier-linter-helpers@^1.0.0: +  version "1.0.0" +  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" +  dependencies: +    fast-diff "^1.1.2" + +prettier-plugin-solidity@^1.0.0-alpha.4: +  version "1.0.0-alpha.11" +  resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-alpha.11.tgz#ef078a80dd471437693a0508de7691dd3ba814af" +  dependencies: +    extract-comments "^1.0.0" +    prettier "^1.14.2" +    solidity-parser-antlr "^0.3.1" +  prettier@^1.11.1:    version "1.12.1"    resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" -prettier@^1.15.3: -  version "1.15.3" -  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a" +prettier@^1.14.2, prettier@^1.14.3: +  version "1.15.2" +  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e"  prettier@^1.15.3:    version "1.15.3" @@ -12805,14 +12481,6 @@ proxy-addr@~2.0.3:      forwarded "~0.1.2"      ipaddr.js "1.6.0" -proxy-addr@~2.0.4: -  version "2.0.4" -  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" -  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA== -  dependencies: -    forwarded "~0.1.2" -    ipaddr.js "1.8.0" -  prr@~0.0.0:    version "0.0.0"    resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" @@ -12963,14 +12631,14 @@ qs@6.5.1, qs@~6.5.1:    version "6.5.1"    resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" -qs@6.5.2, qs@~6.5.2: -  version "6.5.2" -  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" -  qs@~6.4.0:    version "6.4.0"    resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" +qs@~6.5.2: +  version "6.5.2" +  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" +  query-string@^4.1.0:    version "4.3.4"    resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" @@ -13013,13 +12681,6 @@ quick-lru@^1.0.0:    version "1.1.0"    resolved "http://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" -raf@^3.3.0: -  version "3.4.1" -  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" -  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== -  dependencies: -    performance-now "^2.1.0" -  raf@^3.4.0:    version "3.4.0"    resolved "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575" @@ -13082,16 +12743,6 @@ raw-body@2.3.2:      iconv-lite "0.4.19"      unpipe "1.0.0" -raw-body@2.3.3: -  version "2.3.3" -  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" -  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw== -  dependencies: -    bytes "3.0.0" -    http-errors "1.6.3" -    iconv-lite "0.4.23" -    unpipe "1.0.0" -  raw-loader@^0.5.1:    version "0.5.1"    resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" @@ -13174,11 +12825,6 @@ rc@^1.2.7:      minimist "^1.2.0"      strip-json-comments "~2.0.1" -react-anchor-link-smooth-scroll@^1.0.11: -  version "1.0.11" -  resolved "https://registry.yarnpkg.com/react-anchor-link-smooth-scroll/-/react-anchor-link-smooth-scroll-1.0.11.tgz#e53f55b89382df0d85470ebd20e6b349d62eb19d" -  integrity sha512-PaAFtqs00eXbbYPTaiG7sEL2EkVfs+PiarzMnMN66JQWamORiNOzyhumW2tImKeKFUZeFdifqz9iJy/2e4RLnw== -  react-copy-to-clipboard@^5.0.0:    version "5.0.1"    resolved "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz#8eae107bb400be73132ed3b6a7b4fb156090208e" @@ -13225,27 +12871,6 @@ react-event-listener@^0.6.2:      prop-types "^15.6.0"      warning "^4.0.1" -react-flickity-component@^3.1.0: -  version "3.1.0" -  resolved "https://registry.yarnpkg.com/react-flickity-component/-/react-flickity-component-3.1.0.tgz#3e519028e6b622ac852a6ab93a272cdbf37f6e00" -  integrity sha512-SxEnai802/N4P/1l1iKWyqJ2ERGxj2ObvKFeMty2hTtdjLkmW+mkpoqM688lcGNpbSemS5H2xO7Uyxr4daR5qQ== -  dependencies: -    fbjs "^0.8.12" -    flickity "^2.1.1" -    imagesloaded "^4.1.3" -    prop-types "^15.5.10" -    react "^16.3.2" -    react-dom "^16.3.2" - -react-headroom@^2.2.4: -  version "2.2.4" -  resolved "https://registry.yarnpkg.com/react-headroom/-/react-headroom-2.2.4.tgz#e931bf5f91d0ea2c2fbf0f156a2b82d7db6cbe3b" -  integrity sha512-4GTSStn577yXD/N8lc7q0HoRxUA9Wbhp5LyvRt72XUImmQ+4vU5aP84+DkfUXrm5Dzqol/y5SPoRmsdr0Q+bdQ== -  dependencies: -    prop-types "^15.5.8" -    raf "^3.3.0" -    shallowequal "^0.2.2" -  react-helmet@^5.2.0:    version "5.2.0"    resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.0.tgz#a81811df21313a6d55c5f058c4aeba5d6f3d97a7" @@ -13283,11 +12908,6 @@ react-is@^16.4.2, react-is@^16.5.2:    version "16.5.2"    resolved "https://registry.npmjs.org/react-is/-/react-is-16.5.2.tgz#e2a7b7c3f5d48062eb769fcb123505eb928722e3" -react-is@^16.6.0: -  version "16.6.3" -  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0" -  integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA== -  react-jss@^8.1.0:    version "8.6.1"    resolved "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252" @@ -13298,22 +12918,10 @@ react-jss@^8.1.0:      prop-types "^15.6.0"      theming "^1.3.0" -react-lazyload@^2.3.0: -  version "2.3.0" -  resolved "https://registry.yarnpkg.com/react-lazyload/-/react-lazyload-2.3.0.tgz#ccb134223012447074a96543954f44b055dc6185" -  integrity sha512-0z3qmL+qtSERdfKFpn0yKXm+1Gg1ZLZBXnCzHhSGiu1L8iDARuCkbOypxEx9+ETxZvMnXj98xvWCs5jyXTuM2w== -  react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:    version "3.0.4"    resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" -react-loadable@^5.5.0: -  version "5.5.0" -  resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.5.0.tgz#582251679d3da86c32aae2c8e689c59f1196d8c4" -  integrity sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg== -  dependencies: -    prop-types "^15.5.0" -  react-markdown@^3.2.2:    version "3.3.0"    resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-3.3.0.tgz#a87cdd822aa9302d6add9687961dd1a82a45d02e" @@ -13383,27 +12991,6 @@ react-side-effect@^1.0.2, react-side-effect@^1.1.0:      exenv "^1.2.1"      shallowequal "^1.0.1" -react-svg-core@^2.1.0: -  version "2.1.0" -  resolved "https://registry.yarnpkg.com/react-svg-core/-/react-svg-core-2.1.0.tgz#3700322af70117c91f83f18febb481128de3cfbb" -  integrity sha512-gv6A1JDNqs5OWy22Nx7CskieTOcue7YIGM8QiMS5c7PsRyyWbJaRbpHbO/j0qDE49Y6BDUPdkjzU1/py/SCsIQ== -  dependencies: -    babel-core "^6.26.0" -    babel-plugin-react-svg "^2.1.0" -    babel-plugin-syntax-jsx "^6.18.0" -    babel-plugin-transform-object-rest-spread "^6.26.0" -    babel-preset-react "^6.24.1" -    lodash.isplainobject "^4.0.6" -    svgo "^0.7.2" - -react-svg-loader@^2.1.0: -  version "2.1.0" -  resolved "https://registry.yarnpkg.com/react-svg-loader/-/react-svg-loader-2.1.0.tgz#ba15019413b9b11e2012e86580aea1eecc93677e" -  integrity sha512-ojF2pJtqpyvxVejLZCFVBYno/8BPQ5mT6e0LPsR7RTk5gvap4wCYaGR7gW0iYObmWsZAJa/ljrG7ghkZ/2cX8Q== -  dependencies: -    loader-utils "^1.1.0" -    react-svg-core "^2.1.0" -  react-syntax-highlighter@^10.1.1:    version "10.1.1"    resolved "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-10.1.1.tgz#1bf7ad4f2f16d2978b04594407b670671b4d3316" @@ -13784,9 +13371,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:      extend-shallow "^3.0.2"      safe-regex "^1.1.0" -regexpp@^1.0.1: -  version "1.1.0" -  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" +regexpp@^2.0.1: +  version "2.0.1" +  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"  regexpu-core@^1.0.0:    version "1.0.0" @@ -14038,7 +13625,7 @@ require-package-name@^2.0.1:  require-uncached@^1.0.3:    version "1.0.3" -  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" +  resolved "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"    dependencies:      caller-path "^0.1.0"      resolve-from "^1.0.0" @@ -14148,7 +13735,7 @@ right-align@^0.1.1:    dependencies:      align-text "^0.1.1" -rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:    version "2.6.2"    resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"    dependencies: @@ -14210,9 +13797,8 @@ rollbar@^2.4.7:      decache "^3.0.5"  rollbar@^2.5.0: -  version "2.5.1" -  resolved "https://registry.yarnpkg.com/rollbar/-/rollbar-2.5.1.tgz#0416c793e08fd2fd37ea6e2c623aeadb81ce4804" -  integrity sha512-RxYmbdUeL9WLsX1qbFvYJAsKXB76fcwfCtFiIPZURrlGL+0dV+5wR/LibaBqu20UjQfCXpBZcrLlbdw/JpTuSQ== +  version "2.5.0" +  resolved "https://registry.yarnpkg.com/rollbar/-/rollbar-2.5.0.tgz#dbb513eea34f1e3bae57611810c3e6df0ef50a12"    dependencies:      async "~1.2.1"      console-polyfill "0.3.0" @@ -14296,7 +13882,7 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s    version "5.1.1"    resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" -safe-buffer@5.1.2, safe-buffer@^5.1.2: +safe-buffer@^5.1.2:    version "5.1.2"    resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -14474,6 +14060,10 @@ semver@^4.1.0:    version "4.3.6"    resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" +semver@^5.5.1: +  version "5.6.0" +  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" +  semver@~5.1.0:    version "5.1.1"    resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.1.tgz#a3292a373e6f3e0798da0b20641b9a9c5bc47e19" @@ -14819,7 +14409,7 @@ socks@~2.2.0:      ip "^1.1.5"      smart-buffer "^4.0.1" -solc@0.4.24, solc@^0.4.24: +solc@0.4.24:    version "0.4.24"    resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.24.tgz#354f14b269b38cbaa82a47d1ff151723502b954e"    dependencies: @@ -14849,21 +14439,40 @@ solc@^0.4.23:      semver "^5.3.0"      yargs "^4.7.1" -solhint@^1.2.1: -  version "1.2.1" -  resolved "https://registry.yarnpkg.com/solhint/-/solhint-1.2.1.tgz#59a1416cef94da38d587f768a73536d6e3403dd3" +solc@^0.4.24: +  version "0.4.25" +  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.25.tgz#06b8321f7112d95b4b903639b1138a4d292f5faa"    dependencies: -    antlr4 "4.7.0" -    commander "2.11.0" -    eslint "^4.19.1" -    glob "7.1.2" -    ignore "^3.3.7" -    lodash "^4.17.10" +    fs-extra "^0.30.0" +    memorystream "^0.3.1" +    require-from-string "^1.1.0" +    semver "^5.3.0" +    yargs "^4.7.1" + +solhint@^1.4.1: +  version "1.4.1" +  resolved "https://registry.yarnpkg.com/solhint/-/solhint-1.4.1.tgz#921ef9fed83dc945853079865140730d4d2140b2" +  dependencies: +    antlr4 "4.7.1" +    commander "2.18.0" +    eslint "^5.6.0" +    fast-diff "^1.1.2" +    glob "7.1.3" +    ignore "^4.0.6" +    lodash "^4.17.11" +    prettier-linter-helpers "^1.0.0" +  optionalDependencies: +    prettier "^1.14.3" +    prettier-plugin-solidity "^1.0.0-alpha.4"  solidity-parser-antlr@^0.2.12:    version "0.2.12"    resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.2.12.tgz#1154f183d5cdda2c7677549ee584dbdb7fb2269c" +solidity-parser-antlr@^0.3.1: +  version "0.3.2" +  resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.3.2.tgz#1cf9d019280550a31299dc380e87a310dc4ca154" +  sort-keys@^1.0.0:    version "1.1.2"    resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -15312,7 +14921,7 @@ strip-indent@^2.0.0:    version "2.0.0"    resolved "http://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" -strip-json-comments@~2.0.1: +strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:    version "2.0.1"    resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -15384,22 +14993,6 @@ styled-components@^4.0.2:      stylis "^3.5.0"      stylis-rule-sheet "^0.0.10" -styled-components@^4.1.1: -  version "4.1.2" -  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-4.1.2.tgz#f8a685e3b2bcd03c5beac7f2c02bb6ad237da9b3" -  integrity sha512-NdvWatJ2WLqZxAvto+oH0k7GAC/TlAUJTrHoXJddjbCrU6U23EmVbb9LXJBF+d6q6hH+g9nQYOWYPUeX/Vlc2w== -  dependencies: -    "@emotion/is-prop-valid" "^0.6.8" -    "@emotion/unitless" "^0.7.0" -    babel-plugin-styled-components ">= 1" -    css-to-react-native "^2.2.2" -    memoize-one "^4.0.0" -    prop-types "^15.5.4" -    react-is "^16.6.0" -    stylis "^3.5.0" -    stylis-rule-sheet "^0.0.10" -    supports-color "^5.5.0" -  stylis-rule-sheet@^0.0.10:    version "0.0.10"    resolved "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" @@ -15447,7 +15040,7 @@ svg-react-loader@^0.4.6:      traverse "0.6.6"      xml2js "0.4.17" -svgo@^0.7.0, svgo@^0.7.2: +svgo@^0.7.0:    version "0.7.2"    resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"    dependencies: @@ -15531,29 +15124,15 @@ symbol-tree@^3.2.2:    version "3.2.2"    resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" -tabbable@^3.1.0: -  version "3.1.1" -  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-3.1.1.tgz#db7512f28a9a1ed16e4275bd190131be9d5ad8e9" -  integrity sha512-583MHIOwictf7+zbxqO/L5fBqMN6Li4SJ1XTKQA9WzHRA7c2BB+D+Ny7Y6kGqU2u+rHK59+oRzrBvMU53aZz+A== - -table@4.0.2: -  version "4.0.2" -  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" +table@^5.0.2: +  version "5.1.0" +  resolved "https://registry.yarnpkg.com/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7"    dependencies: -    ajv "^5.2.3" -    ajv-keywords "^2.1.0" -    chalk "^2.1.0" -    lodash "^4.17.4" +    ajv "^6.5.3" +    lodash "^4.17.10"      slice-ansi "1.0.0"      string-width "^2.1.1" -tap-listener@^2.0.0: -  version "2.0.0" -  resolved "https://registry.yarnpkg.com/tap-listener/-/tap-listener-2.0.0.tgz#d2e11d0d8e7c92b26a56ae4f35538a248b44ad63" -  integrity sha1-0uEdDY58krJqVq5PNVOKJItErWM= -  dependencies: -    unipointer "^2.1.0" -  tapable@^1.0.0:    version "1.0.0"    resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2" @@ -15738,7 +15317,7 @@ text-extensions@^1.0.0:    version "1.7.0"    resolved "http://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39" -text-table@~0.2.0: +text-table@^0.2.0:    version "0.2.0"    resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -16011,11 +15590,6 @@ truffle-contract@2.0.1:      truffle-contract-schema "0.0.5"      web3 "^0.18.0" -tryer@^1.0.0: -  version "1.0.1" -  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" -  integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== -  ts-jest@^23.10.3:    version "23.10.3"    resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-23.10.3.tgz#f42de669888dfd2795b1491016b1813230d553fa" @@ -16261,11 +15835,6 @@ u2f-api@0.2.7:    version "0.2.7"    resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.2.7.tgz#17bf196b242f6bf72353d9858e6a7566cc192720" -ua-parser-js@^0.7.18: -  version "0.7.19" -  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b" -  integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ== -  ua-parser-js@^0.7.9:    version "0.7.17"    resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" @@ -16367,13 +15936,6 @@ unherit@^1.0.4:      inherits "^2.0.1"      xtend "^4.0.1" -unidragger@^2.3.0: -  version "2.3.0" -  resolved "https://registry.yarnpkg.com/unidragger/-/unidragger-2.3.0.tgz#ab9d9fd62106f3252d88fae5f3a99575e6d31d02" -  integrity sha512-dVkSqQdwcsaNmXaandBAOcJ4QVvkrDPosfCcZ7opYPkAiisCQaGlNw0pg00lBV4MQoWEXsEaiwhtQlbnvlXrQQ== -  dependencies: -    unipointer "^2.3.0" -  unified@^6.1.5:    version "6.1.6"    resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1" @@ -16395,13 +15957,6 @@ union-value@^1.0.0:      is-extendable "^0.1.1"      set-value "^0.4.3" -unipointer@^2.1.0, unipointer@^2.3.0: -  version "2.3.0" -  resolved "https://registry.yarnpkg.com/unipointer/-/unipointer-2.3.0.tgz#ba0dc462ce31c2a88e80810e19c3bae0ce47ed9f" -  integrity sha512-m85sAoELCZhogI1owtJV3Dva7GxkHk2lI7A0otw3o0OwCuC/Q9gi7ehddigEYIAYbhkqNdri+dU1QQkrcBvirQ== -  dependencies: -    ev-emitter "^1.0.1" -  uniq@^1.0.1:    version "1.0.1"    resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -16523,6 +16078,12 @@ uri-js@^3.0.2:    dependencies:      punycode "^2.1.0" +uri-js@^4.2.2: +  version "4.2.2" +  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" +  dependencies: +    punycode "^2.1.0" +  urix@^0.1.0:    version "0.1.0"    resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -17126,24 +16687,6 @@ webidl-conversions@^4.0.2:    version "4.0.2"    resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" -webpack-bundle-analyzer@^3.0.3: -  version "3.0.3" -  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz#dbc7fff8f52058b6714a20fddf309d0790e3e0a0" -  integrity sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw== -  dependencies: -    acorn "^5.7.3" -    bfj "^6.1.1" -    chalk "^2.4.1" -    commander "^2.18.0" -    ejs "^2.6.1" -    express "^4.16.3" -    filesize "^3.6.1" -    gzip-size "^5.0.0" -    lodash "^4.17.10" -    mkdirp "^0.5.1" -    opener "^1.5.1" -    ws "^6.0.0" -  webpack-cli@3.1.2, webpack-cli@^3.1.1:    version "3.1.2"    resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746" @@ -17476,13 +17019,6 @@ ws@^5.2.0:    dependencies:      async-limiter "~1.0.0" -ws@^6.0.0: -  version "6.1.2" -  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8" -  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw== -  dependencies: -    async-limiter "~1.0.0" -  wsrun@^2.2.0:    version "2.2.0"    resolved "https://registry.yarnpkg.com/wsrun/-/wsrun-2.2.0.tgz#fe05ca2c466e9281059d255b2773e7964dbcb3a7" | 
