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
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -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
|
||||
|
||||
|
||||
11
contracts/examples/CHANGELOG.json
Normal file
11
contracts/examples/CHANGELOG.json
Normal file
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1544741676,
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
10
contracts/examples/CHANGELOG.md
Normal file
10
contracts/examples/CHANGELOG.md
Normal file
@@ -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
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
11
contracts/extensions/CHANGELOG.json
Normal file
11
contracts/extensions/CHANGELOG.json
Normal file
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1544741676,
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
10
contracts/extensions/CHANGELOG.md
Normal file
10
contracts/extensions/CHANGELOG.md
Normal file
@@ -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
|
||||
31
contracts/extensions/DEPLOYS.json
Normal file
31
contracts/extensions/DEPLOYS.json
Normal file
@@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
11
contracts/interfaces/CHANGELOG.json
Normal file
11
contracts/interfaces/CHANGELOG.json
Normal file
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1544741676,
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
10
contracts/interfaces/CHANGELOG.md
Normal file
10
contracts/interfaces/CHANGELOG.md
Normal file
@@ -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
|
||||
@@ -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": {
|
||||
|
||||
11
contracts/libs/CHANGELOG.json
Normal file
11
contracts/libs/CHANGELOG.json
Normal file
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1544741676,
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
10
contracts/libs/CHANGELOG.md
Normal file
10
contracts/libs/CHANGELOG.md
Normal file
@@ -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
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -1 +1,11 @@
|
||||
[]
|
||||
[
|
||||
{
|
||||
"timestamp": 1544741676,
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
10
contracts/multisig/CHANGELOG.md
Normal file
10
contracts/multisig/CHANGELOG.md
Normal file
@@ -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
|
||||
@@ -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": {
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
10
contracts/protocol/CHANGELOG.md
Normal file
10
contracts/protocol/CHANGELOG.md
Normal file
@@ -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
|
||||
92
contracts/protocol/DEPLOYS.json
Normal file
92
contracts/protocol/DEPLOYS.json
Normal file
@@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544570656
|
||||
"timestamp": 1544739608
|
||||
}
|
||||
]
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
10
contracts/tokens/CHANGELOG.md
Normal file
10
contracts/tokens/CHANGELOG.md
Normal file
@@ -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
|
||||
16
contracts/tokens/DEPLOYS.json
Normal file
16
contracts/tokens/DEPLOYS.json
Normal file
@@ -0,0 +1,16 @@
|
||||
[
|
||||
{
|
||||
"name": "ZRXToken",
|
||||
"version": "1.0.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "protocol v1 deploy",
|
||||
"networks": {
|
||||
"1": "0xe41d2489571d322189246dafa5ebde1f4699f498",
|
||||
"3": "0xff67881f8d12f372d91baae9752eb3631ff0ed00",
|
||||
"42": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
11
contracts/utils/CHANGELOG.json
Normal file
11
contracts/utils/CHANGELOG.json
Normal file
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1544741676,
|
||||
"version": "1.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
10
contracts/utils/CHANGELOG.md
Normal file
10
contracts/utils/CHANGELOG.md
Normal file
@@ -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
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "2.0.8",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "2.0.7",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "2.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "2.0.1",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.19",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "1.0.18",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.20",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "1.0.19",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "3.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "3.0.3",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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": "*",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "3.0.10",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "3.0.9",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "3.0.10",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "3.0.9",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "4.1.3",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "4.1.2",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.21",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "1.0.20",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "1.1.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "1.1.3",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.16",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "1.0.15",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
|
||||
@@ -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
|
||||
) {
|
||||
|
||||
@@ -185,6 +185,7 @@ export interface ZeroExInstantRequiredBaseConfig {
|
||||
|
||||
export interface ZeroExInstantOptionalBaseConfig {
|
||||
provider: Provider;
|
||||
walletDisplayName: string;
|
||||
availableAssetDatas: string[];
|
||||
defaultAssetBuyAmount: number;
|
||||
defaultSelectedAssetData: string;
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "2.1.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "2.1.3",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "2.2.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "2.2.1",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
},
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "3.0.7",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "3.0.6",
|
||||
"changes": [
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "2.2.8",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1544739608
|
||||
},
|
||||
{
|
||||
"version": "2.2.7",
|
||||
"changes": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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[],
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user