Compare commits
218 Commits
web3-types
...
@0xproject
Author | SHA1 | Date | |
---|---|---|---|
|
2411bfc20f | ||
|
4d4ea8a4d0 | ||
|
595517e68b | ||
|
40ab2de393 | ||
|
723276ae3f | ||
|
76c5945017 | ||
|
01c6fd92e8 | ||
|
3f230a8fdb | ||
|
2a6a71ea6c | ||
|
cd23f220a0 | ||
|
fab88ea2cc | ||
|
688f8615ff | ||
|
d187a31e38 | ||
|
c6f85464ce | ||
|
a220b56736 | ||
|
0e33f45f3d | ||
|
ff7c3012a5 | ||
|
20fec2943b | ||
|
08b30b0706 | ||
|
bf52ce7e72 | ||
|
1bac5019e8 | ||
|
19454a92dc | ||
|
cdbb3a015f | ||
|
644da2b0cb | ||
|
57446d78f1 | ||
|
3e285c0ef1 | ||
|
a322148631 | ||
|
33ec9fdf47 | ||
|
323826111a | ||
|
ddd3d284d9 | ||
|
f55a300f43 | ||
|
08a69ebd6e | ||
|
ddb8e26bec | ||
|
57ca611e12 | ||
|
1eff120f49 | ||
|
4bc6096ec0 | ||
|
95eb114051 | ||
|
9c856de49c | ||
|
d502f79303 | ||
|
5224337323 | ||
|
ef49192170 | ||
|
c9df388731 | ||
|
870da2ab22 | ||
|
6122840241 | ||
|
03b00ef8da | ||
|
84b820abc6 | ||
|
cc4ff568a9 | ||
|
665011174b | ||
|
37f210e9f0 | ||
|
9c01e3a8a0 | ||
|
c4dd9658e7 | ||
|
29aa09e448 | ||
|
1337b6928a | ||
|
ac35d8127e | ||
|
a6ae1efadb | ||
|
bd7b5c51b2 | ||
|
397cd77ef9 | ||
|
743c3dbe01 | ||
|
9f1c212596 | ||
|
defd249565 | ||
|
8926dac78c | ||
|
18cac3f092 | ||
|
01e27426d6 | ||
|
0b09cc36b0 | ||
|
f3cb484f82 | ||
|
0053762760 | ||
|
d72b7299c6 | ||
|
eb89ef79eb | ||
|
066d13f5b7 | ||
|
ec06d8d606 | ||
|
a2e4aaa9a3 | ||
|
26e9696ddb | ||
|
343191e936 | ||
|
3e3b667366 | ||
|
3b45d4727b | ||
|
b4f3450d4a | ||
|
0a8b7cb494 | ||
|
125ace3519 | ||
|
109fc41474 | ||
|
f30353087f | ||
|
d106079d9b | ||
|
dc3be992a3 | ||
|
bed7d87b7f | ||
|
05daab5dea | ||
|
170e5589f9 | ||
|
538914aa52 | ||
|
81deb68c8e | ||
|
36986fe9c9 | ||
|
5791632933 | ||
|
289359bf0d | ||
|
81f6487865 | ||
|
21b797c3f9 | ||
|
de8450d5c9 | ||
|
bcb9ee4cc2 | ||
|
7c87447241 | ||
|
b39d87f357 | ||
|
552b14b1fa | ||
|
5779ffd01b | ||
|
a7c24a17f4 | ||
|
8743c40911 | ||
|
7ef6bd4b14 | ||
|
6af0f08dfc | ||
|
54ae94dde0 | ||
|
c570f3865f | ||
|
ed9d1da297 | ||
|
beb483ea85 | ||
|
46b7fecafe | ||
|
e476682922 | ||
|
8478dc8d6d | ||
|
9f8e41cbfa | ||
|
3916383dd0 | ||
|
a60c8f7d8c | ||
|
4e5cd472c2 | ||
|
e1341bc6d9 | ||
|
d437a66019 | ||
|
542b46a22f | ||
|
6fef533fff | ||
|
ec219fc395 | ||
|
a555a8a374 | ||
|
78e9c48803 | ||
|
18d3e5458a | ||
|
ac25764d12 | ||
|
c55e7fa91a | ||
|
e31ba2e12e | ||
|
73f8ae9a47 | ||
|
32b85625c1 | ||
|
629edd3108 | ||
|
ee77b81551 | ||
|
2c7fdac5cd | ||
|
d118116548 | ||
|
8d01956c3e | ||
|
1dda8c1468 | ||
|
111f7e917e | ||
|
477daf4168 | ||
|
8b52793f2f | ||
|
18b9fe5256 | ||
|
439e864085 | ||
|
f45191d0e8 | ||
|
32feadee42 | ||
|
c4b4bb9e8e | ||
|
8fd705d2af | ||
|
3c36135d6c | ||
|
02ede26893 | ||
|
af21ad1615 | ||
|
07fa01528b | ||
|
38f716bd77 | ||
|
6a410b03ff | ||
|
3cd7bce0a3 | ||
|
6693540f43 | ||
|
647bc5a63e | ||
|
4f76bb2a12 | ||
|
9991ddecc2 | ||
|
3cf2cb89bb | ||
|
2875cfa8c7 | ||
|
87cbbdad72 | ||
|
07de3a1d94 | ||
|
27880a6059 | ||
|
0367e4117a | ||
|
ec582d6e46 | ||
|
4ca706d4e6 | ||
|
72671c1014 | ||
|
a3c31f4f4a | ||
|
db8be4a66e | ||
|
2f7c19e80d | ||
|
7d9c357409 | ||
|
abf41b073c | ||
|
c9b07107f3 | ||
|
773be348a3 | ||
|
b7bb8d9b2a | ||
|
c7c12371ef | ||
|
fb40b10501 | ||
|
d4dce41d3a | ||
|
293b55e51f | ||
|
11bac66046 | ||
|
2a438419ab | ||
|
0f0aca7de5 | ||
|
f699b9a73f | ||
|
214096de9e | ||
|
a0ccb609cd | ||
|
4e05554b3e | ||
|
04c08b9fc8 | ||
|
86c1c8082d | ||
|
c5afc5feb5 | ||
|
8392ee4625 | ||
|
5468358f21 | ||
|
87044313c2 | ||
|
794b155827 | ||
|
4941ffd354 | ||
|
aa8a3ee055 | ||
|
c1d17c83f8 | ||
|
db030016fa | ||
|
ae04f55882 | ||
|
b40fab35f6 | ||
|
644deee8b5 | ||
|
c7302c46e5 | ||
|
4948551703 | ||
|
d7bf003d51 | ||
|
5a827eb3d4 | ||
|
b37076136b | ||
|
3574ab253f | ||
|
312a30578b | ||
|
8243e73413 | ||
|
5175fe8107 | ||
|
8d1e27a1a5 | ||
|
e4ea6e1ec3 | ||
|
f9ad97b978 | ||
|
b145a17d11 | ||
|
3430e2bdac | ||
|
cdcf925378 | ||
|
76029cbf09 | ||
|
b9c1653c1c | ||
|
9593739938 | ||
|
28d63ad8e1 | ||
|
56eeea1e63 | ||
|
642a2cf165 | ||
|
a86f8a81a2 | ||
|
ba9a734ba7 | ||
|
b08374f0ba |
@@ -27,6 +27,15 @@ jobs:
|
||||
key: repo-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- ~/repo
|
||||
test-installation:
|
||||
docker:
|
||||
- image: circleci/node:6.12
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
- restore_cache:
|
||||
keys:
|
||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- run: yarn test:installation
|
||||
test-0xjs:
|
||||
docker:
|
||||
- image: circleci/node:6.12
|
||||
@@ -174,6 +183,9 @@ workflows:
|
||||
main:
|
||||
jobs:
|
||||
- build
|
||||
- test-installation:
|
||||
requires:
|
||||
- build
|
||||
- test-0xjs:
|
||||
requires:
|
||||
- build
|
||||
|
7
.gitignore
vendored
7
.gitignore
vendored
@@ -76,5 +76,12 @@ bin/
|
||||
# generated contract artifacts
|
||||
packages/contracts/src/artifacts
|
||||
|
||||
# generated contract wrappers
|
||||
packages/0x.js/src/contract_wrappers/generated/
|
||||
packages/contracts/src/contract_wrappers/generated/
|
||||
|
||||
# solc-bin in deployer
|
||||
packages/deployer/solc_bin/
|
||||
|
||||
# Monorepo scripts
|
||||
packages/*/scripts/
|
||||
|
67
README.md
67
README.md
@@ -18,35 +18,27 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
|
||||
|
||||
### Published Packages
|
||||
|
||||
| Package | Version | Description |
|
||||
| ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
|
||||
| [`0x.js`](/packages/0x.js) | [](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
|
||||
| [`@0xproject/abi-gen`](/packages/abi-gen) | [](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
|
||||
| [`@0xproject/assert`](/packages/assert) | [](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages |
|
||||
| [`@0xproject/base-contract`](/packages/base-contract) | [](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts |
|
||||
| [`@0xproject/connect`](/packages/connect) | [](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the Standard Relayer API |
|
||||
| [`@0xproject/deployer`](/packages/deployer) | [](https://www.npmjs.com/package/@0xproject/deployer) | Solidity project compiler and deployer framework |
|
||||
| [`@0xproject/dev-utils`](/packages/dev-utils) | [](https://www.npmjs.com/package/@0xproject/dev-utils) | Dev utils to be shared across 0x projects and packages |
|
||||
| [`@0xproject/json-schemas`](/packages/json-schemas) | [](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas |
|
||||
| [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | [](https://www.npmjs.com/package/@0xproject/monorepo-scripts) | Monorepo scripts |
|
||||
| [`@0xproject/react-docs`](/packages/react-docs) | [](https://www.npmjs.com/package/@0xproject/react-docs) | React documentation component for rendering TypeDoc & Doxity generated JSON |
|
||||
| [`@0xproject/react-shared`](/packages/react-shared) | [](https://www.npmjs.com/package/@0xproject/react-shared) | 0x shared react components |
|
||||
| [`@0xproject/sra-report`](/packages/sra-report) | [](https://www.npmjs.com/package/@0xproject/sra-report) | Generate reports for standard relayer API compliance |
|
||||
| [`@0xproject/sol-cov`](/packages/sol-cov) | [](https://www.npmjs.com/package/@0xproject/sol-cov) | Solidity test coverage tool tool |
|
||||
| [`@0xproject/subproviders`](/packages/subproviders) | [](https://www.npmjs.com/package/@0xproject/subproviders) | Useful web3 subproviders (e.g LedgerSubprovider) |
|
||||
| [`@0xproject/tslint-config`](/packages/tslint-config) | [](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x development TSLint rules |
|
||||
| [`@0xproject/types`](/packages/types) | [](https://www.npmjs.com/package/@0xproject/types) | Shared type declarations |
|
||||
| [`@0xproject/utils`](/packages/utils) | [](https://www.npmjs.com/package/@0xproject/utils) | Shared utilities |
|
||||
| [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper |
|
||||
|
||||
### TypeScript Typings
|
||||
|
||||
| Package | Version | Description |
|
||||
| -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------- |
|
||||
| [`chai-as-promised-typescript-typings`](/packages/chai-as-promised-typescript-typings) | [](https://www.npmjs.com/package/chai-as-promised-typescript-typings) | Chai as promised typescript typings |
|
||||
| [`chai-typescript-typings`](/packages/chai-typescript-typings) | [](https://www.npmjs.com/package/chai-typescript-typings) | Chai typescript typings |
|
||||
| [`ethers-typescript-typings`](/packages/ethers-typescript-typings) | [](https://www.npmjs.com/package/ethers-typescript-typings) | [Ethers.js](https://github.com/ethers-io/ethers.js/) typescript typings |
|
||||
| [`web3-typescript-typings`](/packages/web3-typescript-typings) | [](https://www.npmjs.com/package/web3-typescript-typings) | Web3 typescript typings |
|
||||
| Package | Version | Description |
|
||||
| --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
|
||||
| [`0x.js`](/packages/0x.js) | [](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
|
||||
| [`@0xproject/abi-gen`](/packages/abi-gen) | [](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
|
||||
| [`@0xproject/assert`](/packages/assert) | [](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages |
|
||||
| [`@0xproject/base-contract`](/packages/base-contract) | [](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts |
|
||||
| [`@0xproject/connect`](/packages/connect) | [](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the Standard Relayer API |
|
||||
| [`@0xproject/deployer`](/packages/deployer) | [](https://www.npmjs.com/package/@0xproject/deployer) | Solidity project compiler and deployer framework |
|
||||
| [`@0xproject/dev-utils`](/packages/dev-utils) | [](https://www.npmjs.com/package/@0xproject/dev-utils) | Dev utils to be shared across 0x projects and packages |
|
||||
| [`@0xproject/json-schemas`](/packages/json-schemas) | [](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas |
|
||||
| [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | [](https://www.npmjs.com/package/@0xproject/monorepo-scripts) | Monorepo scripts |
|
||||
| [`@0xproject/react-docs`](/packages/react-docs) | [](https://www.npmjs.com/package/@0xproject/react-docs) | React documentation component for rendering TypeDoc & Doxity generated JSON |
|
||||
| [`@0xproject/react-shared`](/packages/react-shared) | [](https://www.npmjs.com/package/@0xproject/react-shared) | 0x shared react components |
|
||||
| [`@0xproject/sra-report`](/packages/sra-report) | [](https://www.npmjs.com/package/@0xproject/sra-report) | Generate reports for standard relayer API compliance |
|
||||
| [`@0xproject/sol-cov`](/packages/sol-cov) | [](https://www.npmjs.com/package/@0xproject/sol-cov) | Solidity test coverage tool tool |
|
||||
| [`@0xproject/subproviders`](/packages/subproviders) | [](https://www.npmjs.com/package/@0xproject/subproviders) | Useful web3 subproviders (e.g LedgerSubprovider) |
|
||||
| [`@0xproject/tslint-config`](/packages/tslint-config) | [](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x development TSLint rules |
|
||||
| [`@0xproject/types`](/packages/types) | [](https://www.npmjs.com/package/@0xproject/types) | Shared type declarations |
|
||||
| [`@0xproject/typescript-typings`](/packages/typescript-typings) | [](https://www.npmjs.com/package/@0xproject/typescript-typings) | Repository of types for external packages |
|
||||
| [`@0xproject/utils`](/packages/utils) | [](https://www.npmjs.com/package/@0xproject/utils) | Shared utilities |
|
||||
| [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper |
|
||||
|
||||
### Private Packages
|
||||
|
||||
@@ -66,6 +58,13 @@ Dedicated documentation pages:
|
||||
* [Smart contracts](https://0xproject.com/docs/contracts)
|
||||
* [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)
|
||||
|
||||
Most of the packages require additional typings for external dependencies.
|
||||
You can include those by prepending @0xproject/typescript-typings package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config.
|
||||
|
||||
```json
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
```
|
||||
|
||||
## Contributing
|
||||
|
||||
We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
|
||||
@@ -88,13 +87,17 @@ yarn install
|
||||
|
||||
### Build
|
||||
|
||||
Build all packages
|
||||
Build all packages. You need to do this before working on any given package. Although these packages
|
||||
as independent, when run from within the monorepo, they are internally symlinked, to make development
|
||||
easier. You can change several packages and run the changes without publishing them first to NPM. When
|
||||
running `rebuild`, Lerna will figure out the dependency order of all the packages, and built them in
|
||||
this order.
|
||||
|
||||
```bash
|
||||
yarn lerna:run build
|
||||
yarn lerna:rebuild
|
||||
```
|
||||
|
||||
Continuously rebuild on exchange
|
||||
Continuously rebuild on change
|
||||
|
||||
```bash
|
||||
yarn dev
|
||||
|
18
package.json
18
package.json
@@ -1,28 +1,36 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "0x-monorepo",
|
||||
"workspaces": ["packages/*"],
|
||||
"workspaces": [
|
||||
"packages/*"
|
||||
],
|
||||
"scripts": {
|
||||
"dev": "lerna run --parallel build:watch",
|
||||
"testrpc": "testrpc -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
|
||||
"prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc",
|
||||
"prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",
|
||||
"report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls",
|
||||
"test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js",
|
||||
"lerna:install": "yarn install",
|
||||
"lerna:run": "lerna run",
|
||||
"lerna:rebuild": "lerna run clean; lerna run build;",
|
||||
"lerna:publish":
|
||||
"yarn install; lerna run clean; lerna run build; lerna publish --registry=https://registry.npmjs.org/"
|
||||
"lerna:clean": "lerna run clean",
|
||||
"lerna:build": "lerna run build",
|
||||
"lerna:rebuild": "run-s lerna:clean lerna:build",
|
||||
"lerna:publish": "run-s lerna:install lerna:rebuild script:publish",
|
||||
"lerna:publish:dry": "run-s lerna:install lerna:rebuild script:publish:dry",
|
||||
"script:publish": "node ./packages/monorepo-scripts/lib/publish.js",
|
||||
"script:publish:dry": "IS_DRY_RUN=true yarn script:publish"
|
||||
},
|
||||
"config": {
|
||||
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"async-child-process": "^1.1.1",
|
||||
"coveralls": "^3.0.0",
|
||||
"ethereumjs-testrpc": "^6.0.3",
|
||||
"lcov-result-merger": "^2.0.0",
|
||||
"lerna": "^2.5.1",
|
||||
"npm-run-all": "^4.1.2",
|
||||
"prettier": "^1.11.1"
|
||||
}
|
||||
}
|
||||
|
@@ -8,3 +8,4 @@ test/
|
||||
/contract_templates/
|
||||
/generated_docs/
|
||||
/scripts/
|
||||
/lib/src/monorepo_scripts/
|
||||
|
1012
packages/0x.js/CHANGELOG.json
Normal file
1012
packages/0x.js/CHANGELOG.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,16 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.34.0 - _April 2, 2018_
|
||||
|
||||
* Fix the bug causing `zeroEx.exchange.fillOrdersUpToAsync` validation to fail if there were some extra orders passed (#470)
|
||||
* Remove automatic instantiation of `zeroEx.orderStateWatcher` (#488)
|
||||
* Add `zeroEx.createOrderStateWatcher` to allow creating arbitrary number of OrderStateWatchers (#488)
|
||||
* Added `stateLayer` setting to `OrderStateWatcherConfig` so OrderStateWatcher can be set to monitor different blockchain state layers (#488)
|
||||
|
||||
## v0.33.2 - _March 18, 2018_
|
||||
|
||||
@@ -37,10 +49,7 @@
|
||||
|
||||
## v0.31.0 - _January 30, 2018_
|
||||
|
||||
* Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the
|
||||
caller can decide on whether to add the personalMessage prefix before relaying the request
|
||||
to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects
|
||||
it to have already been added. (#349)
|
||||
* Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the caller can decide on whether to add the personalMessage prefix before relaying the request to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects it to have already been added. (#349)
|
||||
|
||||
## v0.30.2 - _January 29, 2018_
|
||||
|
||||
@@ -156,16 +165,16 @@
|
||||
## v0.21.0 - _October 10, 2017_
|
||||
|
||||
* Complete rewrite of subscription logic (#182)
|
||||
* Subscriptions no longer return historical logs. If you want them - use `getLogsAsync`
|
||||
* Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood
|
||||
* Subscriptions correctly handle block re-orgs (forks)
|
||||
* Subscriptions correctly backfill logs (connection problems)
|
||||
* They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider
|
||||
* Removed `ContractEventEmitter` and added `LogEvent`
|
||||
* Renamed `zeroEx.token.subscribeAsync` to `zeroEx.token.subscribe`
|
||||
* Added `zeroEx.token.unsubscribe` and `zeroEx.exchange.unsubscribe`
|
||||
* Renamed `zeroEx.exchange.stopWatchingAllEventsAsync` to `zeroEx.exhange.unsubscribeAll`
|
||||
* Renamed `zeroEx.token.stopWatchingAllEventsAsync` to `zeroEx.token.unsubscribeAll`
|
||||
* Subscriptions no longer return historical logs. If you want them - use `getLogsAsync`
|
||||
* Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood
|
||||
* Subscriptions correctly handle block re-orgs (forks)
|
||||
* Subscriptions correctly backfill logs (connection problems)
|
||||
* They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider
|
||||
* Removed `ContractEventEmitter` and added `LogEvent`
|
||||
* Renamed `zeroEx.token.subscribeAsync` to `zeroEx.token.subscribe`
|
||||
* Added `zeroEx.token.unsubscribe` and `zeroEx.exchange.unsubscribe`
|
||||
* Renamed `zeroEx.exchange.stopWatchingAllEventsAsync` to `zeroEx.exhange.unsubscribeAll`
|
||||
* Renamed `zeroEx.token.stopWatchingAllEventsAsync` to `zeroEx.token.unsubscribeAll`
|
||||
* Fixed the batch fills validation by emulating all balance & proxy allowance changes (#185)
|
||||
|
||||
## v0.20.0 - _October 5, 2017_
|
||||
@@ -191,9 +200,9 @@
|
||||
## v0.16.0 - _September 20, 2017_
|
||||
|
||||
* Added the ability to specify custom contract addresses to be used with 0x.js (#165)
|
||||
* ZeroExConfig.exchangeContractAddress
|
||||
* ZeroExConfig.tokenRegistryContractAddress
|
||||
* ZeroExConfig.etherTokenContractAddress
|
||||
* ZeroExConfig.exchangeContractAddress
|
||||
* ZeroExConfig.tokenRegistryContractAddress
|
||||
* ZeroExConfig.etherTokenContractAddress
|
||||
* Added `zeroEx.tokenRegistry.getContractAddressAsync` (#165)
|
||||
|
||||
## v0.15.0 - _September 8, 2017_
|
||||
@@ -233,11 +242,11 @@
|
||||
* Added `zeroEx.token.setUnlimitedAllowanceAsync` (#137)
|
||||
* Added `zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS` (#137)
|
||||
|
||||
## v0.10.4 - _Aug 24, 2017_
|
||||
## v0.10.4 - _August 24, 2017_
|
||||
|
||||
* Fixed a bug where checksummed addresses were being pulled from artifacts and not lower-cased. (#135)
|
||||
|
||||
## v0.10.1 - _Aug 24, 2017_
|
||||
## v0.10.1 - _August 24, 2017_
|
||||
|
||||
* Added `zeroEx.exchange.validateFillOrderThrowIfInvalidAsync` (#128)
|
||||
* Added `zeroEx.exchange.validateFillOrKillOrderThrowIfInvalidAsync` (#128)
|
||||
@@ -252,20 +261,20 @@
|
||||
* Added clear error message when checksummed address is passed to a public method (#124)
|
||||
* Fixes the description of `shouldThrowOnInsufficientBalanceOrAllowance` in docs (#127)
|
||||
|
||||
## v0.9.3 - _Aug 22, 2017_
|
||||
## v0.9.3 - _August 22, 2017_
|
||||
|
||||
* Update contract artifacts to include latest Kovan and Mainnet deploys (#118)
|
||||
|
||||
## v0.9.2 - _Aug 21, 2017_
|
||||
## v0.9.2 - _August 21, 2017_
|
||||
|
||||
* *This version was unpublished because of a publishing issue.*
|
||||
* Update contract artifacts to include latest Kovan and Mainnet deploys (#118)
|
||||
|
||||
## v0.9.1 - _Aug. 16, 2017_
|
||||
## v0.9.1 - _August 16, 2017_
|
||||
|
||||
* Fixed the bug causing `zeroEx.token.getBalanceAsync()` to fail if no addresses available (#120)
|
||||
|
||||
## v0.9.0 - _Jul. 26, 2017_
|
||||
## v0.9.0 - _July 26, 2017_
|
||||
|
||||
* Migrated to the new version of smart contracts (#101)
|
||||
* Removed the ability to call methods on multiple authorized Exchange smart contracts (#106)
|
||||
@@ -276,48 +285,48 @@
|
||||
* Updated to typescript v2.4 (#104)
|
||||
* Fixed an issue with incorrect balance/allowance validation when ZRX is one of the tokens traded (#109)
|
||||
|
||||
## v0.8.0 - _Jul. 4, 2017_
|
||||
## v0.8.0 - _July 4, 2017_
|
||||
|
||||
* Added the ability to call methods on different authorized versions of the Exchange smart contract (#82)
|
||||
* Updated contract artifacts to reflect latest changes to the smart contracts (0xproject/contracts#59)
|
||||
* Added `zeroEx.proxy.isAuthorizedAsync` and `zeroEx.proxy.getAuthorizedAddressesAsync` (#89)
|
||||
* Added `zeroEx.token.subscribeAsync` (#90)
|
||||
* Made contract invalidation functions private (#90)
|
||||
* `zeroEx.token.invalidateContractInstancesAsync`
|
||||
* `zeroEx.exchange.invalidateContractInstancesAsync`
|
||||
* `zeroEx.proxy.invalidateContractInstance`
|
||||
* `zeroEx.tokenRegistry.invalidateContractInstance`
|
||||
* `zeroEx.token.invalidateContractInstancesAsync`
|
||||
* `zeroEx.exchange.invalidateContractInstancesAsync`
|
||||
* `zeroEx.proxy.invalidateContractInstance`
|
||||
* `zeroEx.tokenRegistry.invalidateContractInstance`
|
||||
* Fixed the bug where `zeroEx.setProviderAsync` didn't invalidate etherToken contract's instance
|
||||
|
||||
## v0.7.1 - _Jun. 26, 2017_
|
||||
## v0.7.1 - _June 26, 2017_
|
||||
|
||||
* Added the ability to convert Ether to wrapped Ether tokens and back via `zeroEx.etherToken.depostAsync` and `zeroEx.etherToken.withdrawAsync` (#81)
|
||||
|
||||
## v0.7.0 - _Jun. 22, 2017_
|
||||
## v0.7.0 - _June 22, 2017_
|
||||
|
||||
* Added Kovan smart contract artifacts (#78)
|
||||
* Started returning fillAmount from `fillOrderAsync` and `fillUpToAsync` (#72)
|
||||
* Started returning cancelledAmount from `cancelOrderAsync` (#72)
|
||||
* Renamed type `LogCancelArgs` to `LogCancelContractEventArgs` and `LogFillArgs` to `LogFillContractEventArgs`
|
||||
|
||||
## v0.6.2 - _Jun. 21, 2017_
|
||||
## v0.6.2 - _June 21, 2017_
|
||||
|
||||
* Reduced bundle size
|
||||
* Improved documentation
|
||||
|
||||
## v0.6.1 - _Jun. 19, 2017_
|
||||
## v0.6.1 - _June 19, 2017_
|
||||
|
||||
* Improved documentation
|
||||
|
||||
## v0.6.0 - _Jun. 19, 2017_
|
||||
## v0.6.0 - _June 19, 2017_
|
||||
|
||||
* Made `ZeroEx` class accept `Web3Provider` instance instead of `Web3` instance
|
||||
* Added types for contract event arguments
|
||||
|
||||
## v0.5.2 - _Jun. 15, 2017_
|
||||
## v0.5.2 - _June 15, 2017_
|
||||
|
||||
* Fixed the bug in `postpublish` script that caused that only unminified UMD bundle was uploaded to release page
|
||||
|
||||
## v0.5.1 - _Jun. 15, 2017_
|
||||
## v0.5.1 - _June 15, 2017_
|
||||
|
||||
* Added `postpublish` script to publish to Github Releases with assets.
|
||||
|
@@ -20,11 +20,10 @@ import { ZeroEx } from '0x.js';
|
||||
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
```
|
||||
"include": [
|
||||
"./node_modules/web3-typescript-typings/index.d.ts",
|
||||
"./node_modules/ethers-typescript-typings/index.d.ts"
|
||||
]
|
||||
```json
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
}
|
||||
```
|
||||
|
||||
#### UMD:
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "0x.js",
|
||||
"version": "0.33.2",
|
||||
"version": "0.34.0",
|
||||
"description": "A javascript library for interacting with the 0x protocol",
|
||||
"keywords": [
|
||||
"0x.js",
|
||||
@@ -15,8 +15,6 @@
|
||||
"build:watch": "tsc -w",
|
||||
"prebuild": "run-s clean generate_contract_wrappers",
|
||||
"build": "run-p build:umd:prod build:commonjs; exit 0;",
|
||||
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
|
||||
"upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json",
|
||||
"generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
|
||||
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
|
||||
"test:circleci": "run-s test:coverage",
|
||||
@@ -28,7 +26,10 @@
|
||||
"build:umd:prod": "NODE_ENV=production webpack",
|
||||
"build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
|
||||
"test:commonjs": "run-s build:commonjs run_mocha",
|
||||
"run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit"
|
||||
"run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit",
|
||||
"docs:stage": "yarn build && node ./scripts/stage_docs.js",
|
||||
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
|
||||
"upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
|
||||
},
|
||||
"config": {
|
||||
"artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken",
|
||||
@@ -39,10 +40,13 @@
|
||||
],
|
||||
"docPublishConfigs": {
|
||||
"extraFileIncludes": [
|
||||
"../types/src/index.ts"
|
||||
"../types/src/index.ts",
|
||||
"./src/contract_wrappers/generated/ether_token.ts",
|
||||
"./src/contract_wrappers/generated/token.ts",
|
||||
"./src/contract_wrappers/generated/exchange.ts"
|
||||
],
|
||||
"s3BucketPath": "s3://0xjs-docs-jsons/",
|
||||
"s3StagingBucketPath": "s3://staging-0xjs-docs-jsons/"
|
||||
"s3BucketPath": "s3://doc-jsons/0x.js/",
|
||||
"s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -55,13 +59,13 @@
|
||||
"node": ">=6.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^0.2.6",
|
||||
"@0xproject/dev-utils": "^0.3.0",
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@0xproject/abi-gen": "^0.2.8",
|
||||
"@0xproject/dev-utils": "^0.3.3",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/bintrees": "^1.0.2",
|
||||
"@types/jsonschema": "^1.1.1",
|
||||
"@types/lodash": "^4.14.86",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/node": "^8.0.53",
|
||||
"@types/sinon": "^2.2.2",
|
||||
@@ -69,9 +73,7 @@
|
||||
"awesome-typescript-loader": "^3.1.3",
|
||||
"chai": "^4.0.1",
|
||||
"chai-as-promised": "^7.1.0",
|
||||
"chai-as-promised-typescript-typings": "^0.0.11",
|
||||
"chai-bignumber": "^2.0.1",
|
||||
"chai-typescript-typings": "^0.0.5",
|
||||
"copyfiles": "^1.2.0",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"json-loader": "^0.5.4",
|
||||
@@ -94,24 +96,23 @@
|
||||
"webpack": "^3.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^0.2.1",
|
||||
"@0xproject/base-contract": "^0.0.4",
|
||||
"@0xproject/json-schemas": "^0.7.15",
|
||||
"@0xproject/types": "^0.4.0",
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/web3-wrapper": "^0.3.0",
|
||||
"@0xproject/assert": "^0.2.4",
|
||||
"@0xproject/base-contract": "^0.0.6",
|
||||
"@0xproject/json-schemas": "^0.7.18",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"@0xproject/web3-wrapper": "^0.4.0",
|
||||
"bintrees": "^1.0.2",
|
||||
"bn.js": "^4.11.8",
|
||||
"ethereumjs-abi": "^0.6.4",
|
||||
"ethereumjs-blockstream": "^2.0.6",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"ethers-contracts": "^2.2.1",
|
||||
"ethers-typescript-typings": "^0.0.3",
|
||||
"js-sha3": "^0.7.0",
|
||||
"lodash": "^4.17.4",
|
||||
"uuid": "^3.1.0",
|
||||
"web3": "^0.20.0",
|
||||
"web3-typescript-typings": "^0.10.1"
|
||||
"web3": "^0.20.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
@@ -15,7 +15,7 @@ import { OrderStateWatcher } from './order_watcher/order_state_watcher';
|
||||
import { zeroExConfigSchema } from './schemas/zero_ex_config_schema';
|
||||
import { zeroExPrivateNetworkConfigSchema } from './schemas/zero_ex_private_network_config_schema';
|
||||
import { zeroExPublicNetworkConfigSchema } from './schemas/zero_ex_public_network_config_schema';
|
||||
import { Web3Provider, ZeroExConfig, ZeroExError } from './types';
|
||||
import { OrderStateWatcherConfig, Web3Provider, ZeroExConfig, ZeroExError } from './types';
|
||||
import { assert } from './utils/assert';
|
||||
import { constants } from './utils/constants';
|
||||
import { decorators } from './utils/decorators';
|
||||
@@ -57,11 +57,6 @@ export class ZeroEx {
|
||||
* tokenTransferProxy smart contract.
|
||||
*/
|
||||
public proxy: TokenTransferProxyWrapper;
|
||||
/**
|
||||
* An instance of the OrderStateWatcher class containing methods for watching a set of orders for relevant
|
||||
* blockchain state changes.
|
||||
*/
|
||||
public orderStateWatcher: OrderStateWatcher;
|
||||
private _web3Wrapper: Web3Wrapper;
|
||||
private _abiDecoder: AbiDecoder;
|
||||
/**
|
||||
@@ -83,7 +78,7 @@ export class ZeroEx {
|
||||
}
|
||||
/**
|
||||
* Generates a pseudo-random 256-bit salt.
|
||||
* The salt can be included in an 0x order, ensuring that the order generates a unique orderHash
|
||||
* The salt can be included in a 0x order, ensuring that the order generates a unique orderHash
|
||||
* and will not collide with other outstanding orders that are identical in all other parameters.
|
||||
* @return A pseudo-random 256-bit number that can be used as a salt.
|
||||
*/
|
||||
@@ -197,13 +192,6 @@ export class ZeroEx {
|
||||
config.tokenRegistryContractAddress,
|
||||
);
|
||||
this.etherToken = new EtherTokenWrapper(this._web3Wrapper, config.networkId, this._abiDecoder, this.token);
|
||||
this.orderStateWatcher = new OrderStateWatcher(
|
||||
this._web3Wrapper,
|
||||
this._abiDecoder,
|
||||
this.token,
|
||||
this.exchange,
|
||||
config.orderWatcherConfig,
|
||||
);
|
||||
}
|
||||
/**
|
||||
* Sets a new web3 provider for 0x.js. Updating the provider will stop all
|
||||
@@ -260,7 +248,7 @@ export class ZeroEx {
|
||||
msgHashHex = ethUtil.bufferToHex(msgHashBuff);
|
||||
}
|
||||
|
||||
const signature = await this._web3Wrapper.signTransactionAsync(normalizedSignerAddress, msgHashHex);
|
||||
const signature = await this._web3Wrapper.signMessageAsync(normalizedSignerAddress, msgHashHex);
|
||||
|
||||
// HACK: There is no consensus on whether the signatureHex string should be formatted as
|
||||
// v + r + s OR r + s + v, and different clients (even different versions of the same client)
|
||||
@@ -336,6 +324,15 @@ export class ZeroEx {
|
||||
const txReceipt = await txReceiptPromise;
|
||||
return txReceipt;
|
||||
}
|
||||
/**
|
||||
* Instantiates and returns a new OrderStateWatcher instance.
|
||||
* Defaults to watching the pending state.
|
||||
* @param config The configuration object. Look up the type for the description.
|
||||
* @return An instance of the 0x.js OrderStateWatcher class.
|
||||
*/
|
||||
public createOrderStateWatcher(config?: OrderStateWatcherConfig) {
|
||||
return new OrderStateWatcher(this._web3Wrapper, this._abiDecoder, this.token, this.exchange, config);
|
||||
}
|
||||
/*
|
||||
* HACK: `TokenWrapper` needs a token transfer proxy address. `TokenTransferProxy` address is fetched from
|
||||
* an `ExchangeWrapper`. `ExchangeWrapper` needs `TokenWrapper` to validate orders, creating a dependency cycle.
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { BlockParamLiteral, LogWithDecodedArgs, RawLog } from '@0xproject/types';
|
||||
import { BlockParamLiteral, ContractAbi, FilterObject, LogEntry, LogWithDecodedArgs, RawLog } from '@0xproject/types';
|
||||
import { AbiDecoder, intervalUtils } from '@0xproject/utils';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import { Block, BlockAndLogStreamer } from 'ethereumjs-blockstream';
|
||||
@@ -35,7 +35,7 @@ export class ContractWrapper {
|
||||
private _abiDecoder?: AbiDecoder;
|
||||
private _blockAndLogStreamerIfExists?: BlockAndLogStreamer;
|
||||
private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
|
||||
private _filters: { [filterToken: string]: Web3.FilterObject };
|
||||
private _filters: { [filterToken: string]: FilterObject };
|
||||
private _filterCallbacks: {
|
||||
[filterToken: string]: EventCallback<ContractEventArgs>;
|
||||
};
|
||||
@@ -75,7 +75,7 @@ export class ContractWrapper {
|
||||
address: string,
|
||||
eventName: ContractEvents,
|
||||
indexFilterValues: IndexedFilterValues,
|
||||
abi: Web3.ContractAbi,
|
||||
abi: ContractAbi,
|
||||
callback: EventCallback<ArgsType>,
|
||||
): string {
|
||||
const filter = filterUtils.getFilter(address, eventName, indexFilterValues, abi);
|
||||
@@ -92,7 +92,7 @@ export class ContractWrapper {
|
||||
eventName: ContractEvents,
|
||||
blockRange: BlockRange,
|
||||
indexFilterValues: IndexedFilterValues,
|
||||
abi: Web3.ContractAbi,
|
||||
abi: ContractAbi,
|
||||
): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
|
||||
const filter = filterUtils.getFilter(address, eventName, indexFilterValues, abi, blockRange);
|
||||
const logs = await this._web3Wrapper.getLogsAsync(filter);
|
||||
@@ -100,7 +100,7 @@ export class ContractWrapper {
|
||||
return logsWithDecodedArguments;
|
||||
}
|
||||
protected _tryToDecodeLogOrNoop<ArgsType extends ContractEventArgs>(
|
||||
log: Web3.LogEntry,
|
||||
log: LogEntry,
|
||||
): LogWithDecodedArgs<ArgsType> | RawLog {
|
||||
if (_.isUndefined(this._abiDecoder)) {
|
||||
throw new Error(InternalZeroExError.NoAbiDecoder);
|
||||
@@ -111,7 +111,7 @@ export class ContractWrapper {
|
||||
protected async _getContractAbiAndAddressFromArtifactsAsync(
|
||||
artifact: Artifact,
|
||||
addressIfExists?: string,
|
||||
): Promise<[Web3.ContractAbi, string]> {
|
||||
): Promise<[ContractAbi, string]> {
|
||||
let contractAddress: string;
|
||||
if (_.isUndefined(addressIfExists)) {
|
||||
if (_.isUndefined(artifact.networks[this._networkId])) {
|
||||
@@ -125,7 +125,7 @@ export class ContractWrapper {
|
||||
if (!doesContractExist) {
|
||||
throw new Error(CONTRACT_NAME_TO_NOT_FOUND_ERROR[artifact.contract_name]);
|
||||
}
|
||||
const abiAndAddress: [Web3.ContractAbi, string] = [artifact.abi, contractAddress];
|
||||
const abiAndAddress: [ContractAbi, string] = [artifact.abi, contractAddress];
|
||||
return abiAndAddress;
|
||||
}
|
||||
protected _getContractAddress(artifact: Artifact, addressIfExists?: string): string {
|
||||
@@ -139,8 +139,8 @@ export class ContractWrapper {
|
||||
return addressIfExists;
|
||||
}
|
||||
}
|
||||
private _onLogStateChanged<ArgsType extends ContractEventArgs>(isRemoved: boolean, log: Web3.LogEntry): void {
|
||||
_.forEach(this._filters, (filter: Web3.FilterObject, filterToken: string) => {
|
||||
private _onLogStateChanged<ArgsType extends ContractEventArgs>(isRemoved: boolean, log: LogEntry): void {
|
||||
_.forEach(this._filters, (filter: FilterObject, filterToken: string) => {
|
||||
if (filterUtils.matchesFilter(log, filter)) {
|
||||
const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs<ArgsType>;
|
||||
const logEvent = {
|
||||
|
@@ -64,7 +64,7 @@ export class EtherTokenWrapper extends ContractWrapper {
|
||||
* equivalent number of wrapped ETH tokens.
|
||||
* @param etherTokenAddress EtherToken address you wish to withdraw from.
|
||||
* @param amountInWei Amount of ETH in Wei the caller wishes to withdraw.
|
||||
* @param withdrawer The hex encoded user Ethereum address that would like to make the withdrawl.
|
||||
* @param withdrawer The hex encoded user Ethereum address that would like to make the withdrawal.
|
||||
* @param txOpts Transaction parameters.
|
||||
* @return Transaction hash.
|
||||
*/
|
||||
@@ -96,7 +96,7 @@ export class EtherTokenWrapper extends ContractWrapper {
|
||||
}
|
||||
/**
|
||||
* Gets historical logs without creating a subscription
|
||||
* @param etherTokenAddress An address of the ether token that emmited the logs.
|
||||
* @param etherTokenAddress An address of the ether token that emitted the logs.
|
||||
* @param eventName The ether token contract event you would like to subscribe to.
|
||||
* @param blockRange Block range to get logs from.
|
||||
* @param indexFilterValues An object where the keys are indexed args returned by the event and
|
||||
|
@@ -3,6 +3,7 @@ import {
|
||||
BlockParamLiteral,
|
||||
DecodedLogArgs,
|
||||
ECSignature,
|
||||
LogEntry,
|
||||
LogWithDecodedArgs,
|
||||
Order,
|
||||
SignedOrder,
|
||||
@@ -10,7 +11,6 @@ import {
|
||||
import { AbiDecoder, BigNumber } from '@0xproject/utils';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import * as _ from 'lodash';
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
import { artifacts } from '../artifacts';
|
||||
import {
|
||||
@@ -281,6 +281,9 @@ export class ExchangeWrapper extends ContractWrapper {
|
||||
zrxTokenAddress,
|
||||
);
|
||||
filledTakerTokenAmount = filledTakerTokenAmount.plus(singleFilledTakerTokenAmount);
|
||||
if (filledTakerTokenAmount.eq(fillTakerTokenAmount)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -857,10 +860,10 @@ export class ExchangeWrapper extends ContractWrapper {
|
||||
return isRoundingError;
|
||||
}
|
||||
/**
|
||||
* Checks if logs contain LogError, which is emmited by Exchange contract on transaction failure.
|
||||
* Checks if logs contain LogError, which is emitted by Exchange contract on transaction failure.
|
||||
* @param logs Transaction logs as returned by `zeroEx.awaitTransactionMinedAsync`
|
||||
*/
|
||||
public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void {
|
||||
public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | LogEntry>): void {
|
||||
const errLog = _.find(logs, {
|
||||
event: ExchangeEvents.LogError,
|
||||
});
|
||||
|
@@ -1 +0,0 @@
|
||||
*
|
@@ -385,7 +385,7 @@ export class TokenWrapper extends ContractWrapper {
|
||||
}
|
||||
/**
|
||||
* Gets historical logs without creating a subscription
|
||||
* @param tokenAddress An address of the token that emmited the logs.
|
||||
* @param tokenAddress An address of the token that emitted the logs.
|
||||
* @param eventName The token contract event you would like to subscribe to.
|
||||
* @param blockRange Block range to get logs from.
|
||||
* @param indexFilterValues An object where the keys are indexed args returned by the event and
|
||||
|
5
packages/0x.js/src/globals.d.ts
vendored
5
packages/0x.js/src/globals.d.ts
vendored
@@ -37,12 +37,13 @@ declare module 'ethereumjs-abi' {
|
||||
|
||||
// truffle-hdwallet-provider declarations
|
||||
declare module 'truffle-hdwallet-provider' {
|
||||
import { JSONRPCRequestPayload, JSONRPCResponsePayload } from '@0xproject/types';
|
||||
import * as Web3 from 'web3';
|
||||
class HDWalletProvider implements Web3.Provider {
|
||||
constructor(mnemonic: string, rpcUrl: string);
|
||||
public sendAsync(
|
||||
payload: Web3.JSONRPCRequestPayload,
|
||||
callback: (err: Error, result: Web3.JSONRPCResponsePayload) => void,
|
||||
payload: JSONRPCRequestPayload,
|
||||
callback: (err: Error, result: JSONRPCResponsePayload) => void,
|
||||
): void;
|
||||
}
|
||||
export = HDWalletProvider;
|
||||
|
@@ -16,7 +16,6 @@ export {
|
||||
MethodOpts,
|
||||
OrderTransactionOpts,
|
||||
TransactionOpts,
|
||||
FilterObject,
|
||||
LogEvent,
|
||||
DecodedLogEvent,
|
||||
EventWatcherCallback,
|
||||
@@ -28,6 +27,7 @@ export {
|
||||
|
||||
export {
|
||||
BlockParamLiteral,
|
||||
FilterObject,
|
||||
BlockParam,
|
||||
ContractEventArg,
|
||||
LogWithDecodedArgs,
|
||||
|
@@ -1,9 +1,7 @@
|
||||
import { BlockParamLiteral, LogEntry } from '@0xproject/types';
|
||||
import { intervalUtils } from '@0xproject/utils';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import * as _ from 'lodash';
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
import { BlockParamLiteral } from '@0xproject/types';
|
||||
|
||||
import { EventWatcherCallback, ZeroExError } from '../types';
|
||||
import { assert } from '../utils/assert';
|
||||
@@ -23,9 +21,15 @@ export class EventWatcher {
|
||||
private _web3Wrapper: Web3Wrapper;
|
||||
private _pollingIntervalMs: number;
|
||||
private _intervalIdIfExists?: NodeJS.Timer;
|
||||
private _lastEvents: Web3.LogEntry[] = [];
|
||||
constructor(web3Wrapper: Web3Wrapper, pollingIntervalIfExistsMs: undefined | number) {
|
||||
private _lastEvents: LogEntry[] = [];
|
||||
private _stateLayer: BlockParamLiteral;
|
||||
constructor(
|
||||
web3Wrapper: Web3Wrapper,
|
||||
pollingIntervalIfExistsMs: undefined | number,
|
||||
stateLayer: BlockParamLiteral = BlockParamLiteral.Latest,
|
||||
) {
|
||||
this._web3Wrapper = web3Wrapper;
|
||||
this._stateLayer = stateLayer;
|
||||
this._pollingIntervalMs = _.isUndefined(pollingIntervalIfExistsMs)
|
||||
? DEFAULT_EVENT_POLLING_INTERVAL_MS
|
||||
: pollingIntervalIfExistsMs;
|
||||
@@ -69,16 +73,16 @@ export class EventWatcher {
|
||||
await this._emitDifferencesAsync(newEvents, LogEventState.Added, callback);
|
||||
this._lastEvents = pendingEvents;
|
||||
}
|
||||
private async _getEventsAsync(): Promise<Web3.LogEntry[]> {
|
||||
private async _getEventsAsync(): Promise<LogEntry[]> {
|
||||
const eventFilter = {
|
||||
fromBlock: BlockParamLiteral.Pending,
|
||||
toBlock: BlockParamLiteral.Pending,
|
||||
fromBlock: this._stateLayer,
|
||||
toBlock: this._stateLayer,
|
||||
};
|
||||
const events = await this._web3Wrapper.getLogsAsync(eventFilter);
|
||||
return events;
|
||||
}
|
||||
private async _emitDifferencesAsync(
|
||||
logs: Web3.LogEntry[],
|
||||
logs: LogEntry[],
|
||||
logEventState: LogEventState,
|
||||
callback: EventWatcherCallback,
|
||||
): Promise<void> {
|
||||
|
@@ -59,7 +59,7 @@ const DEFAULT_CLEANUP_JOB_INTERVAL_MS = 1000 * 60 * 60; // 1h
|
||||
/**
|
||||
* This class includes all the functionality related to watching a set of orders
|
||||
* for potential changes in order validity/fillability. The orderWatcher notifies
|
||||
* the subscriber of these changes so that a final decison can be made on whether
|
||||
* the subscriber of these changes so that a final decision can be made on whether
|
||||
* the order should be deemed invalid.
|
||||
*/
|
||||
export class OrderStateWatcher {
|
||||
@@ -86,11 +86,10 @@ export class OrderStateWatcher {
|
||||
this._abiDecoder = abiDecoder;
|
||||
this._web3Wrapper = web3Wrapper;
|
||||
const pollingIntervalIfExistsMs = _.isUndefined(config) ? undefined : config.eventPollingIntervalMs;
|
||||
this._eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalIfExistsMs);
|
||||
this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(
|
||||
token,
|
||||
BlockParamLiteral.Pending,
|
||||
);
|
||||
const stateLayer =
|
||||
_.isUndefined(config) || _.isUndefined(config.stateLayer) ? BlockParamLiteral.Latest : config.stateLayer;
|
||||
this._eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalIfExistsMs, stateLayer);
|
||||
this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(token, stateLayer);
|
||||
this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(exchange);
|
||||
this._orderStateUtils = new OrderStateUtils(
|
||||
this._balanceAndProxyAllowanceLazyStore,
|
||||
|
@@ -3,7 +3,10 @@ import { BigNumber } from '@0xproject/utils';
|
||||
import {
|
||||
BlockParam,
|
||||
BlockParamLiteral,
|
||||
ContractAbi,
|
||||
ContractEventArg,
|
||||
FilterObject,
|
||||
LogEntryEvent,
|
||||
LogWithDecodedArgs,
|
||||
Order,
|
||||
SignedOrder,
|
||||
@@ -48,7 +51,7 @@ export type OrderAddresses = [string, string, string, string, string];
|
||||
|
||||
export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber];
|
||||
|
||||
export type LogEvent = Web3.LogEntryEvent;
|
||||
export type LogEvent = LogEntryEvent;
|
||||
export interface DecodedLogEvent<ArgsType> {
|
||||
isRemoved: boolean;
|
||||
log: LogWithDecodedArgs<ArgsType>;
|
||||
@@ -162,16 +165,18 @@ export type Web3Provider = Web3.Provider;
|
||||
|
||||
/*
|
||||
* orderExpirationCheckingIntervalMs: How often to check for expired orders. Default: 50
|
||||
* eventPollingIntervalMs: How often to poll the Ethereum node for new events. Defaults: 200
|
||||
* eventPollingIntervalMs: How often to poll the Ethereum node for new events. Default: 200
|
||||
* expirationMarginMs: Amount of time before order expiry that you'd like to be notified
|
||||
* of an orders expiration. Defaults: 0
|
||||
* of an orders expiration. Default: 0
|
||||
* cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Defaults: 1h
|
||||
* stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default: latest
|
||||
*/
|
||||
export interface OrderStateWatcherConfig {
|
||||
orderExpirationCheckingIntervalMs?: number;
|
||||
eventPollingIntervalMs?: number;
|
||||
expirationMarginMs?: number;
|
||||
cleanupJobIntervalMs?: number;
|
||||
stateLayer: BlockParamLiteral;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -197,7 +202,7 @@ export type ArtifactContractName = 'ZRX' | 'TokenTransferProxy' | 'TokenRegistry
|
||||
|
||||
export interface Artifact {
|
||||
contract_name: ArtifactContractName;
|
||||
abi: Web3.ContractAbi;
|
||||
abi: ContractAbi;
|
||||
networks: {
|
||||
[networkId: number]: {
|
||||
address: string;
|
||||
@@ -222,7 +227,7 @@ export interface ValidateOrderFillableOpts {
|
||||
* flag when running Parity).
|
||||
*/
|
||||
export interface MethodOpts {
|
||||
defaultBlock?: Web3.BlockParam;
|
||||
defaultBlock?: BlockParam;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -242,8 +247,6 @@ export interface OrderTransactionOpts extends TransactionOpts {
|
||||
shouldValidate?: boolean;
|
||||
}
|
||||
|
||||
export type FilterObject = Web3.FilterObject;
|
||||
|
||||
export enum TradeSide {
|
||||
Maker = 'maker',
|
||||
Taker = 'taker',
|
||||
|
@@ -1,8 +1,16 @@
|
||||
import {
|
||||
ConstructorAbi,
|
||||
ContractAbi,
|
||||
EventAbi,
|
||||
FallbackAbi,
|
||||
FilterObject,
|
||||
LogEntry,
|
||||
MethodAbi,
|
||||
} from '@0xproject/types';
|
||||
import * as ethUtil from 'ethereumjs-util';
|
||||
import * as jsSHA3 from 'js-sha3';
|
||||
import * as _ from 'lodash';
|
||||
import * as uuid from 'uuid/v4';
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
import { BlockRange, ContractEvents, IndexedFilterValues } from '../types';
|
||||
|
||||
@@ -16,15 +24,15 @@ export const filterUtils = {
|
||||
address: string,
|
||||
eventName: ContractEvents,
|
||||
indexFilterValues: IndexedFilterValues,
|
||||
abi: Web3.ContractAbi,
|
||||
abi: ContractAbi,
|
||||
blockRange?: BlockRange,
|
||||
): Web3.FilterObject {
|
||||
const eventAbi = _.find(abi, { name: eventName }) as Web3.EventAbi;
|
||||
): FilterObject {
|
||||
const eventAbi = _.find(abi, { name: eventName }) as EventAbi;
|
||||
const eventSignature = filterUtils.getEventSignatureFromAbiByName(eventAbi, eventName);
|
||||
const topicForEventSignature = ethUtil.addHexPrefix(jsSHA3.keccak256(eventSignature));
|
||||
const topicsForIndexedArgs = filterUtils.getTopicsForIndexedArgs(eventAbi, indexFilterValues);
|
||||
const topics = [topicForEventSignature, ...topicsForIndexedArgs];
|
||||
let filter: Web3.FilterObject = {
|
||||
let filter: FilterObject = {
|
||||
address,
|
||||
topics,
|
||||
};
|
||||
@@ -36,12 +44,12 @@ export const filterUtils = {
|
||||
}
|
||||
return filter;
|
||||
},
|
||||
getEventSignatureFromAbiByName(eventAbi: Web3.EventAbi, eventName: ContractEvents): string {
|
||||
getEventSignatureFromAbiByName(eventAbi: EventAbi, eventName: ContractEvents): string {
|
||||
const types = _.map(eventAbi.inputs, 'type');
|
||||
const signature = `${eventAbi.name}(${types.join(',')})`;
|
||||
return signature;
|
||||
},
|
||||
getTopicsForIndexedArgs(abi: Web3.EventAbi, indexFilterValues: IndexedFilterValues): Array<string | null> {
|
||||
getTopicsForIndexedArgs(abi: EventAbi, indexFilterValues: IndexedFilterValues): Array<string | null> {
|
||||
const topics: Array<string | null> = [];
|
||||
for (const eventInput of abi.inputs) {
|
||||
if (!eventInput.indexed) {
|
||||
@@ -60,7 +68,7 @@ export const filterUtils = {
|
||||
}
|
||||
return topics;
|
||||
},
|
||||
matchesFilter(log: Web3.LogEntry, filter: Web3.FilterObject): boolean {
|
||||
matchesFilter(log: LogEntry, filter: FilterObject): boolean {
|
||||
if (!_.isUndefined(filter.address) && log.address !== filter.address) {
|
||||
return false;
|
||||
}
|
||||
|
@@ -41,11 +41,11 @@ describe('ZeroEx library', () => {
|
||||
expect((zeroEx.tokenRegistry as any)._tokenRegistryContractIfExists).to.be.undefined();
|
||||
|
||||
// Check that all nested web3 wrapper instances return the updated provider
|
||||
const nestedWeb3WrapperProvider = (zeroEx as any)._web3Wrapper.getCurrentProvider();
|
||||
const nestedWeb3WrapperProvider = (zeroEx as any)._web3Wrapper.getProvider();
|
||||
expect(nestedWeb3WrapperProvider.zeroExTestId).to.be.a('number');
|
||||
const exchangeWeb3WrapperProvider = (zeroEx.exchange as any)._web3Wrapper.getCurrentProvider();
|
||||
const exchangeWeb3WrapperProvider = (zeroEx.exchange as any)._web3Wrapper.getProvider();
|
||||
expect(exchangeWeb3WrapperProvider.zeroExTestId).to.be.a('number');
|
||||
const tokenRegistryWeb3WrapperProvider = (zeroEx.tokenRegistry as any)._web3Wrapper.getCurrentProvider();
|
||||
const tokenRegistryWeb3WrapperProvider = (zeroEx.tokenRegistry as any)._web3Wrapper.getProvider();
|
||||
expect(tokenRegistryWeb3WrapperProvider.zeroExTestId).to.be.a('number');
|
||||
});
|
||||
});
|
||||
@@ -216,7 +216,7 @@ describe('ZeroEx library', () => {
|
||||
s: '0x050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb02',
|
||||
};
|
||||
stubs = [
|
||||
Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync').returns(Promise.resolve(signature)),
|
||||
Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
|
||||
Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
|
||||
];
|
||||
|
||||
@@ -237,7 +237,7 @@ describe('ZeroEx library', () => {
|
||||
s: '0x2dea66f25a608bbae457e020fb6decb763deb8b7192abab624997242da248960',
|
||||
};
|
||||
stubs = [
|
||||
Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync').returns(Promise.resolve(signature)),
|
||||
Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
|
||||
Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
|
||||
];
|
||||
|
||||
|
@@ -137,7 +137,7 @@ describe('EtherTokenWrapper', () => {
|
||||
gasCost = expectedETHBalance.minus(postETHBalance);
|
||||
expect(gasCost).to.be.bignumber.lte(MAX_REASONABLE_GAS_COST_IN_WEI);
|
||||
});
|
||||
it('should throw if user has insufficient WETH balance for withdrawl', async () => {
|
||||
it('should throw if user has insufficient WETH balance for withdrawal', async () => {
|
||||
const preWETHBalance = await zeroEx.token.getBalanceAsync(wethContractAddress, addressWithETH);
|
||||
expect(preWETHBalance).to.be.bignumber.equal(0);
|
||||
|
||||
|
@@ -1,4 +1,5 @@
|
||||
import { web3Factory } from '@0xproject/dev-utils';
|
||||
import { LogEntry } from '@0xproject/types';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import * as chai from 'chai';
|
||||
import * as _ from 'lodash';
|
||||
@@ -21,7 +22,7 @@ describe('EventWatcher', () => {
|
||||
let stubs: Sinon.SinonStub[] = [];
|
||||
let eventWatcher: EventWatcher;
|
||||
let web3Wrapper: Web3Wrapper;
|
||||
const logA: Web3.LogEntry = {
|
||||
const logA: LogEntry = {
|
||||
address: '0x71d271f8b14adef568f8f28f1587ce7271ac4ca5',
|
||||
blockHash: null,
|
||||
blockNumber: null,
|
||||
@@ -31,7 +32,7 @@ describe('EventWatcher', () => {
|
||||
transactionHash: '0x004881d38cd4a8f72f1a0d68c8b9b8124504706041ff37019c1d1ed6bfda8e17',
|
||||
transactionIndex: 0,
|
||||
};
|
||||
const logB: Web3.LogEntry = {
|
||||
const logB: LogEntry = {
|
||||
address: '0x8d12a197cb00d4747a1fe03395095ce2a5cc6819',
|
||||
blockHash: null,
|
||||
blockNumber: null,
|
||||
@@ -41,7 +42,7 @@ describe('EventWatcher', () => {
|
||||
transactionHash: '0x01ef3c048b18d9b09ea195b4ed94cf8dd5f3d857a1905ff886b152cfb1166f25',
|
||||
transactionIndex: 0,
|
||||
};
|
||||
const logC: Web3.LogEntry = {
|
||||
const logC: LogEntry = {
|
||||
address: '0x1d271f8b174adef58f1587ce68f8f27271ac4ca5',
|
||||
blockHash: null,
|
||||
blockNumber: null,
|
||||
@@ -64,7 +65,7 @@ describe('EventWatcher', () => {
|
||||
eventWatcher.unsubscribe();
|
||||
});
|
||||
it('correctly emits initial log events', (done: DoneCallback) => {
|
||||
const logs: Web3.LogEntry[] = [logA, logB];
|
||||
const logs: LogEntry[] = [logA, logB];
|
||||
const expectedLogEvents = [
|
||||
{
|
||||
removed: false,
|
||||
@@ -89,8 +90,8 @@ describe('EventWatcher', () => {
|
||||
eventWatcher.subscribe(callback);
|
||||
});
|
||||
it('correctly computes the difference and emits only changes', (done: DoneCallback) => {
|
||||
const initialLogs: Web3.LogEntry[] = [logA, logB];
|
||||
const changedLogs: Web3.LogEntry[] = [logA, logC];
|
||||
const initialLogs: LogEntry[] = [logA, logB];
|
||||
const changedLogs: LogEntry[] = [logA, logC];
|
||||
const expectedLogEvents = [
|
||||
{
|
||||
removed: false,
|
||||
|
@@ -596,6 +596,19 @@ describe('ExchangeWrapper', () => {
|
||||
const remainingFillAmount = fillableAmount.minus(1);
|
||||
expect(anotherFilledAmount).to.be.bignumber.equal(remainingFillAmount);
|
||||
});
|
||||
it('should successfully fill up to specified amount and leave the rest of the orders untouched', async () => {
|
||||
const txHash = await zeroEx.exchange.fillOrdersUpToAsync(
|
||||
signedOrders,
|
||||
fillableAmount,
|
||||
shouldThrowOnInsufficientBalanceOrAllowance,
|
||||
takerAddress,
|
||||
);
|
||||
await zeroEx.awaitTransactionMinedAsync(txHash);
|
||||
const filledAmount = await zeroEx.exchange.getFilledTakerAmountAsync(signedOrderHashHex);
|
||||
const zeroAmount = await zeroEx.exchange.getFilledTakerAmountAsync(anotherOrderHashHex);
|
||||
expect(filledAmount).to.be.bignumber.equal(fillableAmount);
|
||||
expect(zeroAmount).to.be.bignumber.equal(0);
|
||||
});
|
||||
it('should successfully fill up to specified amount even if filling all orders would fail', async () => {
|
||||
const missingBalance = new BigNumber(1); // User will still have enough balance to fill up to 9,
|
||||
// but won't have 10 to fully fill all orders in a batch.
|
||||
|
@@ -15,6 +15,7 @@ import {
|
||||
ZeroEx,
|
||||
ZeroExError,
|
||||
} from '../src';
|
||||
import { OrderStateWatcher } from '../src/order_watcher/order_state_watcher';
|
||||
import { DoneCallback } from '../src/types';
|
||||
|
||||
import { chaiSetup } from './utils/chai_setup';
|
||||
@@ -43,6 +44,7 @@ describe('OrderStateWatcher', () => {
|
||||
let maker: string;
|
||||
let taker: string;
|
||||
let signedOrder: SignedOrder;
|
||||
let orderStateWatcher: OrderStateWatcher;
|
||||
const config = {
|
||||
networkId: constants.TESTRPC_NETWORK_ID,
|
||||
};
|
||||
@@ -50,6 +52,7 @@ describe('OrderStateWatcher', () => {
|
||||
const fillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(5), decimals);
|
||||
before(async () => {
|
||||
zeroEx = new ZeroEx(web3.currentProvider, config);
|
||||
orderStateWatcher = zeroEx.createOrderStateWatcher();
|
||||
exchangeContractAddress = zeroEx.exchange.getContractAddress();
|
||||
userAddresses = await zeroEx.getAvailableAddressesAsync();
|
||||
[, maker, taker] = userAddresses;
|
||||
@@ -76,17 +79,17 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
expect((zeroEx.orderStateWatcher as any)._orderByOrderHash).to.include({
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
expect((orderStateWatcher as any)._orderByOrderHash).to.include({
|
||||
[orderHash]: signedOrder,
|
||||
});
|
||||
let dependentOrderHashes = (zeroEx.orderStateWatcher as any)._dependentOrderHashes;
|
||||
let dependentOrderHashes = (orderStateWatcher as any)._dependentOrderHashes;
|
||||
expect(dependentOrderHashes[signedOrder.maker][signedOrder.makerTokenAddress]).to.have.keys(orderHash);
|
||||
zeroEx.orderStateWatcher.removeOrder(orderHash);
|
||||
expect((zeroEx.orderStateWatcher as any)._orderByOrderHash).to.not.include({
|
||||
orderStateWatcher.removeOrder(orderHash);
|
||||
expect((orderStateWatcher as any)._orderByOrderHash).to.not.include({
|
||||
[orderHash]: signedOrder,
|
||||
});
|
||||
dependentOrderHashes = (zeroEx.orderStateWatcher as any)._dependentOrderHashes;
|
||||
dependentOrderHashes = (orderStateWatcher as any)._dependentOrderHashes;
|
||||
expect(dependentOrderHashes[signedOrder.maker]).to.be.undefined();
|
||||
});
|
||||
it('should no-op when removing a non-existing order', async () => {
|
||||
@@ -103,23 +106,23 @@ describe('OrderStateWatcher', () => {
|
||||
.split('')
|
||||
.reverse()
|
||||
.join('')}`;
|
||||
zeroEx.orderStateWatcher.removeOrder(nonExistentOrderHash);
|
||||
orderStateWatcher.removeOrder(nonExistentOrderHash);
|
||||
});
|
||||
});
|
||||
describe('#subscribe', async () => {
|
||||
afterEach(async () => {
|
||||
zeroEx.orderStateWatcher.unsubscribe();
|
||||
orderStateWatcher.unsubscribe();
|
||||
});
|
||||
it('should fail when trying to subscribe twice', async () => {
|
||||
zeroEx.orderStateWatcher.subscribe(_.noop);
|
||||
expect(() => zeroEx.orderStateWatcher.subscribe(_.noop)).to.throw(ZeroExError.SubscriptionAlreadyPresent);
|
||||
orderStateWatcher.subscribe(_.noop);
|
||||
expect(() => orderStateWatcher.subscribe(_.noop)).to.throw(ZeroExError.SubscriptionAlreadyPresent);
|
||||
});
|
||||
});
|
||||
describe('tests with cleanup', async () => {
|
||||
afterEach(async () => {
|
||||
zeroEx.orderStateWatcher.unsubscribe();
|
||||
orderStateWatcher.unsubscribe();
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.removeOrder(orderHash);
|
||||
orderStateWatcher.removeOrder(orderHash);
|
||||
});
|
||||
it('should emit orderStateInvalid when maker allowance set to 0 for watched order', (done: DoneCallback) => {
|
||||
(async () => {
|
||||
@@ -131,14 +134,14 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.false();
|
||||
const invalidOrderState = orderState as OrderStateInvalid;
|
||||
expect(invalidOrderState.orderHash).to.be.equal(orderHash);
|
||||
expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.InsufficientMakerAllowance);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, new BigNumber(0));
|
||||
})().catch(done);
|
||||
});
|
||||
@@ -151,11 +154,11 @@ describe('OrderStateWatcher', () => {
|
||||
taker,
|
||||
fillableAmount,
|
||||
);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
throw new Error('OrderState callback fired for irrelevant order');
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
const notTheMaker = userAddresses[0];
|
||||
const anyRecipient = taker;
|
||||
const transferAmount = new BigNumber(2);
|
||||
@@ -175,14 +178,14 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.false();
|
||||
const invalidOrderState = orderState as OrderStateInvalid;
|
||||
expect(invalidOrderState.orderHash).to.be.equal(orderHash);
|
||||
expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.InsufficientMakerBalance);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
const anyRecipient = taker;
|
||||
const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
|
||||
await zeroEx.token.transferAsync(makerToken.address, maker, anyRecipient, makerBalance);
|
||||
@@ -198,7 +201,7 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.false();
|
||||
@@ -206,7 +209,7 @@ describe('OrderStateWatcher', () => {
|
||||
expect(invalidOrderState.orderHash).to.be.equal(orderHash);
|
||||
expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderRemainingFillAmountZero);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
|
||||
const shouldThrowOnInsufficientBalanceOrAllowance = true;
|
||||
await zeroEx.exchange.fillOrderAsync(
|
||||
@@ -230,7 +233,7 @@ describe('OrderStateWatcher', () => {
|
||||
const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
|
||||
const fillAmountInBaseUnits = new BigNumber(2);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.true();
|
||||
@@ -247,7 +250,7 @@ describe('OrderStateWatcher', () => {
|
||||
);
|
||||
expect(orderRelevantState.makerBalance).to.be.bignumber.equal(remainingMakerBalance);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
const shouldThrowOnInsufficientBalanceOrAllowance = true;
|
||||
await zeroEx.exchange.fillOrderAsync(
|
||||
signedOrder,
|
||||
@@ -272,8 +275,8 @@ describe('OrderStateWatcher', () => {
|
||||
taker,
|
||||
);
|
||||
const callback = reportNodeCallbackErrors(done)();
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, new BigNumber(0));
|
||||
})().catch(done);
|
||||
});
|
||||
@@ -292,7 +295,7 @@ describe('OrderStateWatcher', () => {
|
||||
);
|
||||
const fillAmountInBaseUnits = ZeroEx.toBaseUnitAmount(new BigNumber(2), decimals);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.true();
|
||||
const validOrderState = orderState as OrderStateValid;
|
||||
@@ -305,7 +308,7 @@ describe('OrderStateWatcher', () => {
|
||||
ZeroEx.toBaseUnitAmount(new BigNumber(8), decimals),
|
||||
);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
const shouldThrowOnInsufficientBalanceOrAllowance = true;
|
||||
await zeroEx.exchange.fillOrderAsync(
|
||||
signedOrder,
|
||||
@@ -326,7 +329,7 @@ describe('OrderStateWatcher', () => {
|
||||
);
|
||||
|
||||
const changedMakerApprovalAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), decimals);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
const validOrderState = orderState as OrderStateValid;
|
||||
@@ -338,7 +341,7 @@ describe('OrderStateWatcher', () => {
|
||||
changedMakerApprovalAmount,
|
||||
);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, changedMakerApprovalAmount);
|
||||
})().catch(done);
|
||||
});
|
||||
@@ -356,7 +359,7 @@ describe('OrderStateWatcher', () => {
|
||||
|
||||
const remainingAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), decimals);
|
||||
const transferAmount = makerBalance.sub(remainingAmount);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.true();
|
||||
@@ -369,7 +372,7 @@ describe('OrderStateWatcher', () => {
|
||||
remainingAmount,
|
||||
);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.token.transferAsync(makerToken.address, maker, ZeroEx.NULL_ADDRESS, transferAmount);
|
||||
})().catch(done);
|
||||
});
|
||||
@@ -391,7 +394,7 @@ describe('OrderStateWatcher', () => {
|
||||
|
||||
const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
|
||||
const transferTokenAmount = makerFee.sub(remainingTokenAmount);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.true();
|
||||
@@ -401,7 +404,7 @@ describe('OrderStateWatcher', () => {
|
||||
remainingTokenAmount,
|
||||
);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.exchange.cancelOrderAsync(signedOrder, transferTokenAmount);
|
||||
})().catch(done);
|
||||
});
|
||||
@@ -425,7 +428,7 @@ describe('OrderStateWatcher', () => {
|
||||
|
||||
const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
|
||||
const transferTokenAmount = makerFee.sub(remainingTokenAmount);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
const validOrderState = orderState as OrderStateValid;
|
||||
@@ -434,7 +437,7 @@ describe('OrderStateWatcher', () => {
|
||||
remainingFeeAmount,
|
||||
);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, remainingFeeAmount);
|
||||
await zeroEx.token.transferAsync(
|
||||
makerToken.address,
|
||||
@@ -460,7 +463,7 @@ describe('OrderStateWatcher', () => {
|
||||
feeRecipient,
|
||||
);
|
||||
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
const validOrderState = orderState as OrderStateValid;
|
||||
@@ -469,7 +472,7 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.token.setProxyAllowanceAsync(
|
||||
makerToken.address,
|
||||
maker,
|
||||
@@ -488,7 +491,7 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.false();
|
||||
@@ -496,7 +499,7 @@ describe('OrderStateWatcher', () => {
|
||||
expect(invalidOrderState.orderHash).to.be.equal(orderHash);
|
||||
expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderRemainingFillAmountZero);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
|
||||
await zeroEx.exchange.cancelOrderAsync(signedOrder, fillableAmount);
|
||||
})().catch(done);
|
||||
@@ -512,7 +515,7 @@ describe('OrderStateWatcher', () => {
|
||||
fillableAmount,
|
||||
);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.false();
|
||||
@@ -520,7 +523,7 @@ describe('OrderStateWatcher', () => {
|
||||
expect(invalidOrderState.orderHash).to.be.equal(orderHash);
|
||||
expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderFillRoundingError);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.exchange.cancelOrderAsync(
|
||||
signedOrder,
|
||||
fillableAmount.minus(remainingFillableAmountInBaseUnits),
|
||||
@@ -539,7 +542,7 @@ describe('OrderStateWatcher', () => {
|
||||
|
||||
const cancelAmountInBaseUnits = new BigNumber(2);
|
||||
const orderHash = ZeroEx.getOrderHashHex(signedOrder);
|
||||
zeroEx.orderStateWatcher.addOrder(signedOrder);
|
||||
orderStateWatcher.addOrder(signedOrder);
|
||||
|
||||
const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
|
||||
expect(orderState.isValid).to.be.true();
|
||||
@@ -548,7 +551,7 @@ describe('OrderStateWatcher', () => {
|
||||
const orderRelevantState = validOrderState.orderRelevantState;
|
||||
expect(orderRelevantState.cancelledTakerTokenAmount).to.be.bignumber.equal(cancelAmountInBaseUnits);
|
||||
});
|
||||
zeroEx.orderStateWatcher.subscribe(callback);
|
||||
orderStateWatcher.subscribe(callback);
|
||||
await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelAmountInBaseUnits);
|
||||
})().catch(done);
|
||||
});
|
||||
|
@@ -8,10 +8,6 @@
|
||||
"./src/**/*",
|
||||
"./test/**/*",
|
||||
"../../node_modules/types-bn/index.d.ts",
|
||||
"../../node_modules/types-ethereumjs-util/index.d.ts",
|
||||
"../../node_modules/ethers-typescript-typings/index.d.ts",
|
||||
"../../node_modules/web3-typescript-typings/index.d.ts",
|
||||
"../../node_modules/chai-typescript-typings/index.d.ts",
|
||||
"../../node_modules/chai-as-promised-typescript-typings/index.d.ts"
|
||||
"../../node_modules/types-ethereumjs-util/index.d.ts"
|
||||
]
|
||||
}
|
||||
|
@@ -3,3 +3,4 @@ yarn-error.log
|
||||
/src/
|
||||
/scripts/
|
||||
tsconfig.json
|
||||
/lib/monorepo_scripts/
|
||||
|
89
packages/abi-gen/CHANGELOG.json
Normal file
89
packages/abi-gen/CHANGELOG.json
Normal file
@@ -0,0 +1,89 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1522658513,
|
||||
"version": "0.2.8",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.2.5",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package",
|
||||
"pr": 452
|
||||
}
|
||||
],
|
||||
"timestamp": 1521298800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.2.4",
|
||||
"changes": [
|
||||
{
|
||||
"note":
|
||||
"Add a `backend` parameter that allows you to specify the Ethereum library you use in your templates (`web3` or `ethers`). Ethers auto-converts small ints to numbers whereas Web3 doesn't. Defaults to `web3`",
|
||||
"pr": 413
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Add support for [tuple types](https://solidity.readthedocs.io/en/develop/abi-spec.html#handling-tuple-types)",
|
||||
"pr": 413
|
||||
},
|
||||
{
|
||||
"note": "Add `hasReturnValue` to context data",
|
||||
"pr": 413
|
||||
}
|
||||
],
|
||||
"timestamp": 1520089200,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.2.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
|
||||
"pr": 389
|
||||
}
|
||||
],
|
||||
"timestamp": 1518102000,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Added CLI options for explicit specifying location of partials and main template",
|
||||
"pr": 346
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts",
|
||||
"pr": 388
|
||||
}
|
||||
],
|
||||
"timestamp": 1517929200,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.1.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fixed array typings with union types",
|
||||
"pr": 295
|
||||
},
|
||||
{
|
||||
"note": "Add event ABIs to context data passed to templates",
|
||||
"pr": 302
|
||||
},
|
||||
{
|
||||
"note": "Add constructor ABIs to context data passed to templates",
|
||||
"pr": 304
|
||||
}
|
||||
],
|
||||
"timestamp": 1515596400,
|
||||
"isPublished": true
|
||||
}
|
||||
]
|
@@ -1,4 +1,13 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.2.8 - _April 2, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.2.5 - _March 18, 2018_
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/abi-gen",
|
||||
"version": "0.2.6",
|
||||
"version": "0.2.8",
|
||||
"description": "Generate contract wrappers from ABI and handlebars templates",
|
||||
"main": "lib/index.js",
|
||||
"types": "lib/index.d.ts",
|
||||
@@ -23,19 +23,20 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"chalk": "^2.3.0",
|
||||
"glob": "^7.1.2",
|
||||
"handlebars": "^4.0.11",
|
||||
"lodash": "^4.17.4",
|
||||
"mkdirp": "^0.5.1",
|
||||
"to-snake-case": "^1.0.0",
|
||||
"web3": "^0.20.0",
|
||||
"yargs": "^10.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/glob": "^5.0.33",
|
||||
"@types/handlebars": "^4.0.36",
|
||||
"@types/mkdirp": "^0.5.1",
|
||||
@@ -45,8 +46,7 @@
|
||||
"npm-run-all": "^4.1.2",
|
||||
"shx": "^0.2.2",
|
||||
"tslint": "5.8.0",
|
||||
"typescript": "2.7.1",
|
||||
"web3-typescript-typings": "^0.10.1"
|
||||
"typescript": "2.7.1"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
import { AbiDefinition, ConstructorAbi, EventAbi, MethodAbi } from '@0xproject/types';
|
||||
import { logUtils } from '@0xproject/utils';
|
||||
import chalk from 'chalk';
|
||||
import * as fs from 'fs';
|
||||
@@ -10,7 +11,6 @@ import * as mkdirp from 'mkdirp';
|
||||
import * as yargs from 'yargs';
|
||||
|
||||
import toSnakeCase = require('to-snake-case');
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
import { ContextData, ContractsBackend, ParamKind } from './types';
|
||||
import { utils } from './utils';
|
||||
@@ -120,12 +120,12 @@ for (const abiFileName of abiFileNames) {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
let ctor = ABI.find((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_CONSTRUCTOR) as Web3.ConstructorAbi;
|
||||
let ctor = ABI.find((abi: AbiDefinition) => abi.type === ABI_TYPE_CONSTRUCTOR) as ConstructorAbi;
|
||||
if (_.isUndefined(ctor)) {
|
||||
ctor = utils.getEmptyConstructor(); // The constructor exists, but it's implicit in JSON's ABI definition
|
||||
}
|
||||
|
||||
const methodAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_METHOD) as Web3.MethodAbi[];
|
||||
const methodAbis = ABI.filter((abi: AbiDefinition) => abi.type === ABI_TYPE_METHOD) as MethodAbi[];
|
||||
const methodsData = _.map(methodAbis, methodAbi => {
|
||||
_.map(methodAbi.inputs, (input, i: number) => {
|
||||
if (_.isEmpty(input.name)) {
|
||||
@@ -142,7 +142,7 @@ for (const abiFileName of abiFileNames) {
|
||||
return methodData;
|
||||
});
|
||||
|
||||
const eventAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_EVENT) as Web3.EventAbi[];
|
||||
const eventAbis = ABI.filter((abi: AbiDefinition) => abi.type === ABI_TYPE_EVENT) as EventAbi[];
|
||||
|
||||
const contextData = {
|
||||
contractName: namedContent.name,
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import * as Web3 from 'web3';
|
||||
import { EventAbi, MethodAbi } from '@0xproject/types';
|
||||
|
||||
export enum ParamKind {
|
||||
Input = 'input',
|
||||
@@ -17,7 +17,7 @@ export enum ContractsBackend {
|
||||
Ethers = 'ethers',
|
||||
}
|
||||
|
||||
export interface Method extends Web3.MethodAbi {
|
||||
export interface Method extends MethodAbi {
|
||||
singleReturnValue: boolean;
|
||||
hasReturnValue: boolean;
|
||||
}
|
||||
@@ -25,5 +25,5 @@ export interface Method extends Web3.MethodAbi {
|
||||
export interface ContextData {
|
||||
contractName: string;
|
||||
methods: Method[];
|
||||
events: Web3.EventAbi[];
|
||||
events: EventAbi[];
|
||||
}
|
||||
|
@@ -1,17 +1,12 @@
|
||||
import { ConstructorAbi, DataItem } from '@0xproject/types';
|
||||
import * as fs from 'fs';
|
||||
import * as _ from 'lodash';
|
||||
import * as path from 'path';
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
import { AbiType, ContractsBackend, ParamKind } from './types';
|
||||
|
||||
export const utils = {
|
||||
solTypeToTsType(
|
||||
paramKind: ParamKind,
|
||||
backend: ContractsBackend,
|
||||
solType: string,
|
||||
components?: Web3.DataItem[],
|
||||
): string {
|
||||
solTypeToTsType(paramKind: ParamKind, backend: ContractsBackend, solType: string, components?: DataItem[]): string {
|
||||
const trailingArrayRegex = /\[\d*\]$/;
|
||||
if (solType.match(trailingArrayRegex)) {
|
||||
const arrayItemSolType = solType.replace(trailingArrayRegex, '');
|
||||
@@ -89,7 +84,7 @@ export const utils = {
|
||||
throw new Error(`Failed to read ${filename}: ${err}`);
|
||||
}
|
||||
},
|
||||
getEmptyConstructor(): Web3.ConstructorAbi {
|
||||
getEmptyConstructor(): ConstructorAbi {
|
||||
return {
|
||||
type: AbiType.Constructor,
|
||||
stateMutability: 'nonpayable',
|
||||
|
@@ -3,5 +3,5 @@
|
||||
"compilerOptions": {
|
||||
"outDir": "lib"
|
||||
},
|
||||
"include": ["./src/**/*", "./test/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"]
|
||||
"include": ["./src/**/*", "./test/**/*"]
|
||||
}
|
||||
|
@@ -4,3 +4,4 @@ yarn-error.log
|
||||
/scripts/
|
||||
test/
|
||||
tsconfig.json
|
||||
/lib/src/monorepo_scripts/
|
||||
|
62
packages/assert/CHANGELOG.json
Normal file
62
packages/assert/CHANGELOG.json
Normal file
@@ -0,0 +1,62 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1522658513,
|
||||
"version": "0.2.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Rename `isHttpUrl` to `isWebUri`",
|
||||
"pr": 412
|
||||
}
|
||||
],
|
||||
"timestamp": 1520434800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.1.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Remove isETHAddressHex checksum address check and assume address will be lowercased ",
|
||||
"pr": 373
|
||||
},
|
||||
{
|
||||
"note": "Add an optional parameter `subSchemas` to `doesConformToSchema` method",
|
||||
"pr": 385
|
||||
}
|
||||
],
|
||||
"timestamp": 1520089200,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.0.18",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
|
||||
"pr": 389
|
||||
}
|
||||
],
|
||||
"timestamp": 1486566000,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Re-publish Assert previously published under NPM package @0xproject/0x-assert"
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals."
|
||||
}
|
||||
],
|
||||
"timestamp": 1510585200,
|
||||
"isPublished": true
|
||||
}
|
||||
]
|
@@ -1,4 +1,13 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.2.4 - _April 2, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.2.0 - _March 8, 2018_
|
||||
|
||||
|
@@ -8,14 +8,6 @@ Standard type and schema assertions to be used across all 0x projects and packag
|
||||
yarn add @0xproject/assert
|
||||
```
|
||||
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
```
|
||||
"include": [
|
||||
"./node_modules/web3-typescript-typings/index.d.ts",
|
||||
]
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
```typescript
|
||||
@@ -24,6 +16,14 @@ import { assert } from '@0xproject/assert';
|
||||
assert.isValidBaseUnitAmount('baseUnitAmount', baseUnitAmount);
|
||||
```
|
||||
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
```json
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
}
|
||||
```
|
||||
|
||||
## Contributing
|
||||
|
||||
We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
|
||||
|
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "@0xproject/assert",
|
||||
"version": "0.2.1",
|
||||
"version": "0.2.4",
|
||||
"description": "Provides a standard way of performing type and schema validation across 0x projects",
|
||||
"main": "lib/src/index.js",
|
||||
"types": "lib/src/index.d.ts",
|
||||
"scripts": {
|
||||
"build:watch": "tsc -w",
|
||||
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
|
||||
"clean": "shx rm -rf _bundles lib test_temp scripts",
|
||||
"clean": "shx rm -rf lib test_temp scripts",
|
||||
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
|
||||
"run_mocha": "mocha lib/test/**/*_test.js",
|
||||
"prepublishOnly": "run-p build",
|
||||
@@ -26,13 +26,12 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@types/lodash": "^4.14.86",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/valid-url": "^1.0.2",
|
||||
"chai": "^4.0.1",
|
||||
"chai-typescript-typings": "^0.0.5",
|
||||
"copyfiles": "^1.2.0",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"mocha": "^4.0.1",
|
||||
@@ -43,8 +42,9 @@
|
||||
"typescript": "2.7.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/json-schemas": "^0.7.15",
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/json-schemas": "^0.7.18",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"lodash": "^4.17.4",
|
||||
"valid-url": "^1.0.9"
|
||||
},
|
||||
|
@@ -3,10 +3,5 @@
|
||||
"compilerOptions": {
|
||||
"outDir": "lib"
|
||||
},
|
||||
"include": [
|
||||
"./src/**/*",
|
||||
"./test/**/*",
|
||||
"../../node_modules/web3-typescript-typings/index.d.ts",
|
||||
"../../node_modules/chai-typescript-typings/index.d.ts"
|
||||
]
|
||||
"include": ["./src/**/*", "./test/**/*"]
|
||||
}
|
||||
|
@@ -3,3 +3,4 @@ yarn-error.log
|
||||
/scripts/
|
||||
/src/
|
||||
tsconfig.json
|
||||
/lib/monorepo_scripts/
|
||||
|
21
packages/base-contract/CHANGELOG.json
Normal file
21
packages/base-contract/CHANGELOG.json
Normal file
@@ -0,0 +1,21 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1522658513,
|
||||
"version": "0.0.6",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.0.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Initial release"
|
||||
}
|
||||
],
|
||||
"timestamp": 1520089200,
|
||||
"isPublished": true
|
||||
}
|
||||
]
|
@@ -1,4 +1,13 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.0.6 - _April 2, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.2 - _March 4, 2018_
|
||||
|
||||
|
@@ -10,11 +10,10 @@ yarn add @0xproject/base-contract
|
||||
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
```
|
||||
"include": [
|
||||
"./node_modules/web3-typescript-typings/index.d.ts",
|
||||
"./node_modules/ethers-typescript-typings/index.d.ts"
|
||||
]
|
||||
```json
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
}
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/base-contract",
|
||||
"version": "0.0.4",
|
||||
"version": "0.0.6",
|
||||
"description": "0x Base TS contract",
|
||||
"main": "lib/index.js",
|
||||
"types": "lib/index.d.ts",
|
||||
@@ -20,9 +20,9 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@types/lodash": "^4.14.86",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/lodash": "4.14.104",
|
||||
"copyfiles": "^1.2.0",
|
||||
"npm-run-all": "^4.1.2",
|
||||
"shx": "^0.2.2",
|
||||
@@ -30,13 +30,11 @@
|
||||
"typescript": "2.7.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/types": "^0.4.0",
|
||||
"@0xproject/web3-wrapper": "^0.3.0",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/web3-wrapper": "^0.4.0",
|
||||
"ethers-contracts": "^2.2.1",
|
||||
"ethers-typescript-typings": "^0.0.3",
|
||||
"lodash": "^4.17.4",
|
||||
"web3": "^0.20.0",
|
||||
"web3-typescript-typings": "^0.10.1"
|
||||
"lodash": "^4.17.4"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
@@ -1,16 +1,15 @@
|
||||
import { TxData, TxDataPayable } from '@0xproject/types';
|
||||
import { ContractAbi, DataItem, TxData, TxDataPayable } from '@0xproject/types';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import * as ethersContracts from 'ethers-contracts';
|
||||
import * as _ from 'lodash';
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
export class BaseContract {
|
||||
protected _ethersInterface: ethersContracts.Interface;
|
||||
protected _web3Wrapper: Web3Wrapper;
|
||||
public abi: Web3.ContractAbi;
|
||||
public abi: ContractAbi;
|
||||
public address: string;
|
||||
protected static _transformABIData(
|
||||
abis: Web3.DataItem[],
|
||||
abis: DataItem[],
|
||||
values: any[],
|
||||
transformation: (type: string, value: any) => any,
|
||||
): any {
|
||||
@@ -46,20 +45,20 @@ export class BaseContract {
|
||||
// 2. Global config passed in at library instantiation
|
||||
// 3. Gas estimate calculation + safety margin
|
||||
const removeUndefinedProperties = _.pickBy;
|
||||
const txDataWithDefaults = {
|
||||
const txDataWithDefaults = ({
|
||||
to: this.address,
|
||||
...removeUndefinedProperties(this._web3Wrapper.getContractDefaults()),
|
||||
...removeUndefinedProperties(txData as any),
|
||||
// HACK: TS can't prove that T is spreadable.
|
||||
// Awaiting https://github.com/Microsoft/TypeScript/pull/13288 to be merged
|
||||
};
|
||||
} as any) as TxData;
|
||||
if (_.isUndefined(txDataWithDefaults.gas) && !_.isUndefined(estimateGasAsync)) {
|
||||
const estimatedGas = await estimateGasAsync(txData);
|
||||
txDataWithDefaults.gas = estimatedGas;
|
||||
}
|
||||
return txDataWithDefaults;
|
||||
}
|
||||
constructor(web3Wrapper: Web3Wrapper, abi: Web3.ContractAbi, address: string) {
|
||||
constructor(web3Wrapper: Web3Wrapper, abi: ContractAbi, address: string) {
|
||||
this._web3Wrapper = web3Wrapper;
|
||||
this.abi = abi;
|
||||
this.address = address;
|
||||
|
@@ -3,9 +3,5 @@
|
||||
"compilerOptions": {
|
||||
"outDir": "lib"
|
||||
},
|
||||
"include": [
|
||||
"./src/**/*",
|
||||
"../../node_modules/web3-typescript-typings/index.d.ts",
|
||||
"../../node_modules/ethers-typescript-typings/index.d.ts"
|
||||
]
|
||||
"include": ["./src/**/*"]
|
||||
}
|
||||
|
@@ -1,3 +0,0 @@
|
||||
.*
|
||||
yarn-error.log
|
||||
/scripts/
|
@@ -1,3 +0,0 @@
|
||||
# CHANGELOG
|
||||
|
||||
## v0.x.x - _TBD, 2018_
|
@@ -1,43 +0,0 @@
|
||||
## chai-as-promised-typescript-typings
|
||||
|
||||
Fork of type definitions for chai-as-promised that includes changes made by dirty-chai
|
||||
|
||||
## Installation
|
||||
|
||||
```bash
|
||||
yarn add -D chai-as-promised-typescript-typings
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
Add the following line within an `include` section of your `tsconfig.json`
|
||||
|
||||
```json
|
||||
"./node_modules/chai-as-promised-typescript-typings/index.d.ts"
|
||||
```
|
||||
|
||||
## Contributing
|
||||
|
||||
We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
|
||||
|
||||
Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
|
||||
|
||||
### Install Dependencies
|
||||
|
||||
If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
|
||||
|
||||
```bash
|
||||
yarn config set workspaces-experimental true
|
||||
```
|
||||
|
||||
Then install dependencies
|
||||
|
||||
```bash
|
||||
yarn install
|
||||
```
|
||||
|
||||
### Lint
|
||||
|
||||
```bash
|
||||
yarn lint
|
||||
```
|
@@ -1,3 +0,0 @@
|
||||
# CHANGELOG
|
||||
|
||||
## v0.x.x - _TBD, 2018_
|
@@ -1,6 +0,0 @@
|
||||
declare module '*.json' {
|
||||
const json: any;
|
||||
/* tslint:disable */
|
||||
export default json;
|
||||
/* tslint:enable */
|
||||
}
|
@@ -1,28 +0,0 @@
|
||||
{
|
||||
"name": "chai-typescript-typings",
|
||||
"version": "0.0.5",
|
||||
"description": "Typescript type definitions for chai",
|
||||
"main": "index.d.ts",
|
||||
"types": "index.d.ts",
|
||||
"scripts": {
|
||||
"build": "tsc && copyfiles -u 1 './lib/**/*' ./scripts",
|
||||
"clean": "shx rm -rf scripts"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/0xProject/0x-monorepo.git"
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
"bugs": {
|
||||
"url": "https://github.com/0xProject/0x-monorepo/issues"
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/chai-typescript-typings#readme",
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"copyfiles": "^1.2.0",
|
||||
"shx": "^0.2.2"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
}
|
||||
}
|
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"extends": "../../tsconfig",
|
||||
"compilerOptions": {
|
||||
"outDir": "lib"
|
||||
},
|
||||
"include": ["./monorepo_scripts/**/*"]
|
||||
}
|
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"extends": ["tslint-config-0xproject"]
|
||||
}
|
@@ -5,3 +5,4 @@ yarn-error.log
|
||||
/generated_docs/
|
||||
test/
|
||||
tsconfig.json
|
||||
/lib/src/monorepo_scripts/
|
||||
|
130
packages/connect/CHANGELOG.json
Normal file
130
packages/connect/CHANGELOG.json
Normal file
@@ -0,0 +1,130 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1522658513,
|
||||
"version": "0.6.7",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.6.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package",
|
||||
"pr": 456
|
||||
}
|
||||
],
|
||||
"timestamp": 1521298800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.6.2",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fix JSON parse empty response",
|
||||
"pr": 407
|
||||
}
|
||||
],
|
||||
"timestamp": 1518706800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.6.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add pagination options to HttpClient methods",
|
||||
"pr": 393
|
||||
},
|
||||
{
|
||||
"note": "Add heartbeat configuration to WebSocketOrderbookChannel constructor",
|
||||
"pr": 406
|
||||
}
|
||||
],
|
||||
"timestamp": 1518706800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.5.7",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
|
||||
"pr": 389
|
||||
}
|
||||
],
|
||||
"timestamp": 1518102000,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.5.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Sanitize api endpoint url and remove trailing slashes",
|
||||
"pr": 318
|
||||
},
|
||||
{
|
||||
"note": "Improve error message text in HttpClient",
|
||||
"pr": 318
|
||||
},
|
||||
{
|
||||
"note": "Stop appending '/v0' to api endpoint url in HttpClient",
|
||||
"pr": 318
|
||||
}
|
||||
],
|
||||
"timestamp": 1516114800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.4.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Prevent getFeesAsync method on HttpClient from mutating input",
|
||||
"pr": 296
|
||||
}
|
||||
],
|
||||
"timestamp": 1515596400,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.3.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Expose WebSocketOrderbookChannel and associated types to public interface",
|
||||
"pr": 251
|
||||
},
|
||||
{
|
||||
"note": "Remove tokenA and tokenB fields from OrdersRequest",
|
||||
"pr": 256
|
||||
}
|
||||
],
|
||||
"timestamp": 1512658800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add SignedOrder and TokenTradeInfo to the public interface"
|
||||
},
|
||||
{
|
||||
"note": "Add ECSignature and Order to the public interface"
|
||||
},
|
||||
{
|
||||
"note": "Remove dependency on 0x.js"
|
||||
}
|
||||
],
|
||||
"timestamp": 1511881200,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.1.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Provide a HttpClient class for interacting with standard relayer api compliant HTTP urls"
|
||||
}
|
||||
],
|
||||
"timestamp": 1511276400,
|
||||
"isPublished": true
|
||||
}
|
||||
]
|
@@ -1,4 +1,13 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.6.7 - _April 2, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.6.4 - _March 18, 2018_
|
||||
|
||||
|
@@ -10,10 +10,10 @@ yarn add @0xproject/connect
|
||||
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
```
|
||||
"include": [
|
||||
"./node_modules/web3-typescript-typings/index.d.ts",
|
||||
]
|
||||
```json
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
}
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/connect",
|
||||
"version": "0.6.4",
|
||||
"version": "0.6.7",
|
||||
"description": "A javascript library for interacting with the standard relayer api",
|
||||
"keywords": [
|
||||
"connect",
|
||||
@@ -14,26 +14,24 @@
|
||||
"scripts": {
|
||||
"build:watch": "tsc -w",
|
||||
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
|
||||
"clean": "shx rm -rf _bundles lib test_temp scripts",
|
||||
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
|
||||
"upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json",
|
||||
"clean": "shx rm -rf lib test_temp scripts",
|
||||
"copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
|
||||
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
|
||||
"run_mocha": "mocha lib/test/**/*_test.js",
|
||||
"test": "run-s clean build copy_test_fixtures run_mocha",
|
||||
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
|
||||
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
|
||||
"test:circleci": "yarn test:coverage"
|
||||
"test:circleci": "yarn test:coverage",
|
||||
"docs:stage": "yarn build && node ./scripts/stage_docs.js",
|
||||
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
|
||||
"upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
|
||||
},
|
||||
"config": {
|
||||
"postpublish": {
|
||||
"assets": [
|
||||
"packages/connect/_bundles/index.js",
|
||||
"packages/connect/_bundles/index.min.js"
|
||||
],
|
||||
"assets": [],
|
||||
"docPublishConfigs": {
|
||||
"s3BucketPath": "s3://connect-docs-jsons/",
|
||||
"s3StagingBucketPath": "s3://staging-connect-docs-jsons/"
|
||||
"s3BucketPath": "s3://doc-jsons/connect/",
|
||||
"s3StagingBucketPath": "s3://staging-doc-jsons/connect/"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -51,28 +49,27 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^0.2.1",
|
||||
"@0xproject/json-schemas": "^0.7.15",
|
||||
"@0xproject/types": "^0.4.0",
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/assert": "^0.2.4",
|
||||
"@0xproject/json-schemas": "^0.7.18",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
"lodash": "^4.17.4",
|
||||
"query-string": "^5.0.1",
|
||||
"websocket": "^1.0.25"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/fetch-mock": "^5.12.1",
|
||||
"@types/lodash": "^4.14.86",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/query-string": "^5.0.1",
|
||||
"@types/websocket": "^0.0.34",
|
||||
"async-child-process": "^1.1.1",
|
||||
"chai": "^4.0.1",
|
||||
"chai-as-promised": "^7.1.0",
|
||||
"chai-as-promised-typescript-typings": "^0.0.11",
|
||||
"chai-typescript-typings": "^0.0.5",
|
||||
"copyfiles": "^1.2.0",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"fetch-mock": "^5.13.1",
|
||||
@@ -82,8 +79,7 @@
|
||||
"shx": "^0.2.2",
|
||||
"tslint": "5.8.0",
|
||||
"typedoc": "~0.8.0",
|
||||
"typescript": "2.7.1",
|
||||
"web3-typescript-typings": "^0.10.1"
|
||||
"typescript": "2.7.1"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
@@ -3,11 +3,5 @@
|
||||
"compilerOptions": {
|
||||
"outDir": "lib"
|
||||
},
|
||||
"include": [
|
||||
"./src/**/*",
|
||||
"./test/**/*",
|
||||
"../../node_modules/web3-typescript-typings/index.d.ts",
|
||||
"../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
|
||||
"../../node_modules/chai-typescript-typings/index.d.ts"
|
||||
]
|
||||
"include": ["./src/**/*", "./test/**/*"]
|
||||
}
|
||||
|
@@ -5,7 +5,7 @@
|
||||
// tslint:disable:no-consecutive-blank-lines
|
||||
// tslint:disable-next-line:no-unused-variable
|
||||
import { BaseContract } from '@0xproject/base-contract';
|
||||
import { TxData, TxDataPayable } from '@0xproject/types';
|
||||
import { BlockParam, BlockParamLiteral, CallData, ContractAbi, DataItem, MethodAbi, TxData, TxDataPayable } from '@0xproject/types';
|
||||
import { BigNumber, classUtils, promisify } from '@0xproject/utils';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import * as ethersContracts from 'ethers-contracts';
|
||||
@@ -40,7 +40,7 @@ export class {{contractName}}Contract extends BaseContract {
|
||||
{{> tx contractName=../contractName}}
|
||||
{{/this.constant}}
|
||||
{{/each}}
|
||||
constructor(web3Wrapper: Web3Wrapper, abi: Web3.ContractAbi, address: string) {
|
||||
constructor(web3Wrapper: Web3Wrapper, abi: ContractAbi, address: string) {
|
||||
super(web3Wrapper, abi, address);
|
||||
classUtils.bindAll(this, ['_ethersInterface', 'address', 'abi', '_web3Wrapper']);
|
||||
}
|
||||
|
@@ -1,27 +1,22 @@
|
||||
{{#hasReturnValue}}
|
||||
async callAsync(
|
||||
{{> typed_params inputs=inputs}}
|
||||
{{#this.payable}}
|
||||
txData: TxDataPayable = {},
|
||||
{{/this.payable}}
|
||||
{{^this.payable}}
|
||||
txData: TxData = {},
|
||||
{{/this.payable}}
|
||||
defaultBlock?: Web3.BlockParam,
|
||||
callData: Partial<CallData> = {},
|
||||
defaultBlock?: BlockParam,
|
||||
): Promise<{{> return_type outputs=outputs}}> {
|
||||
const self = this as {{contractName}}Contract;
|
||||
const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
|
||||
const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
|
||||
const encodedData = self._ethersInterface.functions.{{this.name}}(
|
||||
{{> params inputs=inputs}}
|
||||
).data;
|
||||
const callData = await self._applyDefaultsToTxDataAsync(
|
||||
const callDataWithDefaults = await self._applyDefaultsToTxDataAsync(
|
||||
{
|
||||
data: encodedData,
|
||||
}
|
||||
)
|
||||
const rawCallResult = await self._web3Wrapper.callAsync(callData, defaultBlock);
|
||||
const outputAbi = _.find(this.abi, {name: '{{this.name}}'}).outputs as Web3.DataItem[];
|
||||
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
|
||||
const outputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).outputs;
|
||||
const outputParamsTypes = _.map(outputAbi, 'type');
|
||||
let resultArray = ethersContracts.Interface.decodeParams(outputParamsTypes, rawCallResult) as any;
|
||||
resultArray = BaseContract._transformABIData(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
|
||||
|
@@ -2,16 +2,16 @@ public {{this.name}} = {
|
||||
async sendTransactionAsync(
|
||||
{{> typed_params inputs=inputs}}
|
||||
{{#this.payable}}
|
||||
txData: TxDataPayable = {},
|
||||
txData: Partial<TxDataPayable> = {},
|
||||
{{/this.payable}}
|
||||
{{^this.payable}}
|
||||
txData: TxData = {},
|
||||
txData: Partial<TxData> = {},
|
||||
{{/this.payable}}
|
||||
): Promise<string> {
|
||||
const self = this as {{contractName}}Contract;
|
||||
const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
|
||||
const encodedData = this._ethersInterface.functions.{{this.name}}(
|
||||
const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
|
||||
const encodedData = self._ethersInterface.functions.{{this.name}}(
|
||||
{{> params inputs=inputs}}
|
||||
).data
|
||||
const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
|
||||
@@ -24,17 +24,17 @@ public {{this.name}} = {
|
||||
{{> params inputs=inputs}}
|
||||
),
|
||||
);
|
||||
const txHash = await this._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
|
||||
const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
|
||||
return txHash;
|
||||
},
|
||||
async estimateGasAsync(
|
||||
{{> typed_params inputs=inputs}}
|
||||
txData: TxData = {},
|
||||
txData: Partial<TxData> = {},
|
||||
): Promise<number> {
|
||||
const self = this as {{contractName}}Contract;
|
||||
const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
|
||||
const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
|
||||
const encodedData = this._ethersInterface.functions.{{this.name}}(
|
||||
const encodedData = self._ethersInterface.functions.{{this.name}}(
|
||||
{{> params inputs=inputs}}
|
||||
).data
|
||||
const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
|
||||
@@ -43,17 +43,16 @@ public {{this.name}} = {
|
||||
data: encodedData,
|
||||
}
|
||||
);
|
||||
const gas = await this._web3Wrapper.estimateGasAsync(txDataWithDefaults);
|
||||
const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
|
||||
return gas;
|
||||
},
|
||||
getABIEncodedTransactionData(
|
||||
{{> typed_params inputs=inputs}}
|
||||
txData: TxData = {},
|
||||
): string {
|
||||
const self = this as {{contractName}}Contract;
|
||||
const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
|
||||
const abiEncodedTransactionData = this._ethersInterface.functions.{{this.name}}(
|
||||
const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
|
||||
[{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
|
||||
const abiEncodedTransactionData = self._ethersInterface.functions.{{this.name}}(
|
||||
{{> params inputs=inputs}}
|
||||
).data
|
||||
return abiEncodedTransactionData;
|
||||
|
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "contracts",
|
||||
"version": "2.1.16",
|
||||
"version": "2.1.20",
|
||||
"description": "Smart contract components of 0x protocol",
|
||||
"main": "index.js",
|
||||
"directories": {
|
||||
@@ -18,7 +18,7 @@
|
||||
"compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
|
||||
"compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir src/artifacts",
|
||||
"clean": "shx rm -rf ./lib",
|
||||
"generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
|
||||
"generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
|
||||
"migrate": "yarn build && yarn compile && node ./lib/migrations/index.js",
|
||||
"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
|
||||
"coverage:report:text": "istanbul report text",
|
||||
@@ -27,6 +27,7 @@
|
||||
"test:circleci": "yarn test:coverage"
|
||||
},
|
||||
"config": {
|
||||
"abis": "src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json",
|
||||
"contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels"
|
||||
},
|
||||
"repository": {
|
||||
@@ -40,39 +41,37 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/dev-utils": "^0.3.0",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@0xproject/dev-utils": "^0.3.3",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/bluebird": "^3.5.3",
|
||||
"@types/lodash": "^4.14.86",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/node": "^8.0.53",
|
||||
"@types/request-promise-native": "^1.0.2",
|
||||
"@types/yargs": "^10.0.0",
|
||||
"chai": "^4.0.1",
|
||||
"chai-as-promised": "^7.1.0",
|
||||
"chai-as-promised-typescript-typings": "^0.0.11",
|
||||
"chai-bignumber": "^2.0.1",
|
||||
"chai-typescript-typings": "^0.0.5",
|
||||
"copyfiles": "^1.2.0",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"ethers-typescript-typings": "^0.0.3",
|
||||
"mocha": "^4.0.1",
|
||||
"npm-run-all": "^4.1.2",
|
||||
"prettier": "^1.11.1",
|
||||
"shx": "^0.2.2",
|
||||
"solc": "^0.4.18",
|
||||
"tslint": "5.8.0",
|
||||
"types-bn": "^0.0.1",
|
||||
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
|
||||
"typescript": "2.7.1",
|
||||
"web3-typescript-typings": "^0.10.1",
|
||||
"yargs": "^10.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"0x.js": "^0.33.2",
|
||||
"@0xproject/deployer": "^0.3.0",
|
||||
"@0xproject/json-schemas": "^0.7.15",
|
||||
"@0xproject/types": "^0.4.0",
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/web3-wrapper": "^0.3.0",
|
||||
"0x.js": "^0.34.0",
|
||||
"@0xproject/deployer": "^0.3.4",
|
||||
"@0xproject/json-schemas": "^0.7.18",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"@0xproject/web3-wrapper": "^0.4.0",
|
||||
"bluebird": "^3.5.0",
|
||||
"bn.js": "^4.11.8",
|
||||
"ethereumjs-abi": "^0.6.4",
|
||||
|
@@ -1 +0,0 @@
|
||||
*
|
@@ -8,11 +8,6 @@
|
||||
"allowJs": true
|
||||
},
|
||||
"include": [
|
||||
"../../node_modules/types-ethereumjs-util/index.d.ts",
|
||||
"../../node_modules/chai-typescript-typings/index.d.ts",
|
||||
"../../node_modules/web3-typescript-typings/index.d.ts",
|
||||
"../../node_modules/ethers-typescript-typings/index.d.ts",
|
||||
"../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
|
||||
"../../node_modules/types-ethereumjs-util/index.d.ts",
|
||||
"../../node_modules/types-bn/index.d.ts",
|
||||
"./globals.d.ts",
|
||||
|
@@ -1,3 +1,4 @@
|
||||
import { AbiDefinition, MethodAbi } from '@0xproject/types';
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
import ABI = require('ethereumjs-abi');
|
||||
import ethUtil = require('ethereumjs-util');
|
||||
@@ -10,8 +11,8 @@ import { TransactionDataParams } from './types';
|
||||
|
||||
export class MultiSigWrapper {
|
||||
private _multiSig: MultiSigWalletContract;
|
||||
public static encodeFnArgs(name: string, abi: Web3.AbiDefinition[], args: any[]) {
|
||||
const abiEntity = _.find(abi, { name }) as Web3.MethodAbi;
|
||||
public static encodeFnArgs(name: string, abi: AbiDefinition[], args: any[]) {
|
||||
const abiEntity = _.find(abi, { name }) as MethodAbi;
|
||||
if (_.isUndefined(abiEntity)) {
|
||||
throw new Error(`Did not find abi entry for name: ${name}`);
|
||||
}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import { AbiDefinition, ContractAbi } from '@0xproject/types';
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
export interface BalancesByOwner {
|
||||
[ownerAddress: string]: {
|
||||
@@ -51,7 +51,7 @@ export interface DefaultOrderParams {
|
||||
|
||||
export interface TransactionDataParams {
|
||||
name: string;
|
||||
abi: Web3.AbiDefinition[];
|
||||
abi: AbiDefinition[];
|
||||
args: any[];
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ export interface Artifact {
|
||||
contract_name: ContractName;
|
||||
networks: {
|
||||
[networkId: number]: {
|
||||
abi: Web3.ContractAbi;
|
||||
abi: ContractAbi;
|
||||
solc_version: string;
|
||||
keccak256: string;
|
||||
optimizer_enabled: number;
|
||||
|
@@ -4,3 +4,4 @@ yarn-error.log
|
||||
/scripts/
|
||||
test/
|
||||
tsconfig.json
|
||||
/lib/src/monorepo_scripts/
|
||||
|
107
packages/deployer/CHANGELOG.json
Normal file
107
packages/deployer/CHANGELOG.json
Normal file
@@ -0,0 +1,107 @@
|
||||
[
|
||||
{
|
||||
"version": "0.3.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Create solc_bin directory if does not exist before attempting to compile",
|
||||
"pr": 491
|
||||
}
|
||||
],
|
||||
"timestamp": 1522658513
|
||||
},
|
||||
{
|
||||
"version": "0.3.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add TS types for `yargs`"
|
||||
}
|
||||
],
|
||||
"timestamp": 1521298800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.3.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add support for Solidity 0.4.20 and 0.4.21"
|
||||
},
|
||||
{
|
||||
"note": "Replace `jsonrpcPort` config with `jsonrpcUrl`",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Replace `jsonrpc-port` CLI option with `jsonrpc-url`",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Export the `Compiler`",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Load solc from remote source instead of having it locally",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Add `bytecode`, `runtime_bytecode`, `source_map`, `source_map_runtime` and `sources` fields to artifacts",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Remove 0x-specific `migrate` command",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Allow deployer to accept a provider instead of port and host. This makes it possible to run it with in-process ganache-core",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package",
|
||||
"pr": 452
|
||||
},
|
||||
{
|
||||
"note": "Add `#!/usr/bin/env node` pragma above `cli.ts` script to fix command-line error."
|
||||
}
|
||||
],
|
||||
"timestamp": 1521298800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Check dependencies when determining if contracts should be recompiled",
|
||||
"pr": 408
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Improve an error message for when deployer is supplied with an incorrect number of constructor arguments",
|
||||
"pr": 419
|
||||
}
|
||||
],
|
||||
"timestamp": 1520089200,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.1.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add the ability to pass in specific contracts to compile in CLI",
|
||||
"pr": 400
|
||||
}
|
||||
],
|
||||
"timestamp": 1518706800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.0.8",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
|
||||
"pr": 389
|
||||
}
|
||||
],
|
||||
"timestamp": 1518102000,
|
||||
"isPublished": true
|
||||
}
|
||||
]
|
@@ -1,4 +1,13 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.3.4 - _April 2, 2018_
|
||||
|
||||
* Create solc_bin directory if does not exist before attempting to compile (#491)
|
||||
|
||||
## v0.3.1 - _March 18, 2018_
|
||||
|
||||
|
@@ -2,66 +2,42 @@
|
||||
|
||||
This repository contains a CLI tool that facilitates compiling and deployment of smart contracts.
|
||||
|
||||
### Read the [Documentation](0xproject.com/docs/deployer).
|
||||
|
||||
## Installation
|
||||
|
||||
#### CLI Installation
|
||||
|
||||
```bash
|
||||
yarn global add @0xproject/deployer
|
||||
```
|
||||
|
||||
#### API Installation
|
||||
|
||||
```bash
|
||||
yarn add @0xproject/deployer
|
||||
```
|
||||
|
||||
## Usage
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
### CLI Usage
|
||||
|
||||
```bash
|
||||
node ./node_modules/@0xproject/deployer/lib/cli.js --help
|
||||
cli.js [command]
|
||||
|
||||
Commands:
|
||||
cli.js compile compile contracts
|
||||
cli.js deploy deploy a single contract with provided arguments
|
||||
|
||||
Options:
|
||||
--version Show version number [boolean]
|
||||
--contracts-dir path of contracts directory to compile
|
||||
[string] [default: "/Users/leonidlogvinov/Dev/0x/contracts"]
|
||||
--network-id mainnet=1, kovan=42, testrpc=50 [number] [default: 50]
|
||||
--should-optimize enable optimizer [boolean] [default: false]
|
||||
--artifacts-dir path to write contracts artifacts to
|
||||
[string] [default: "/Users/leonidlogvinov/Dev/0x/build/artifacts/"]
|
||||
--jsonrpc-port port connected to JSON RPC [number] [default: 8545]
|
||||
--gas-price gasPrice to be used for transactions
|
||||
[string] [default: "2000000000"]
|
||||
--account account to use for deploying contracts [string]
|
||||
--help Show help [boolean]
|
||||
```json
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
}
|
||||
```
|
||||
|
||||
### API Usage
|
||||
|
||||
## Migrations
|
||||
|
||||
You might want to write a migration scripts (similar to `truffle migrate`), that deploys multiple contracts and configures them. Below you'll find a simple example of such a script to help you get started.
|
||||
**Import**
|
||||
|
||||
```typescript
|
||||
import { Deployer } from '@0xproject/deployer';
|
||||
import * as path from 'path';
|
||||
|
||||
const deployerOpts = {
|
||||
artifactsDir: path.resolve('src', 'artifacts'),
|
||||
jsonrpcUrl: 'http://localhost:8545',
|
||||
networkId: 50,
|
||||
defaults: {
|
||||
gas: 1000000,
|
||||
},
|
||||
};
|
||||
|
||||
const deployer = new Deployer(deployerOpts);
|
||||
|
||||
(async () => {
|
||||
const etherToken = await deployer.deployAndSaveAsync('WETH9');
|
||||
})().catch(console.log);
|
||||
import { Deployer, Compiler } from '@0xproject/deployer';
|
||||
```
|
||||
|
||||
A more sophisticated example can be found [here](https://github.com/0xProject/0x-monorepo/tree/development/packages/contracts/migrations)
|
||||
or
|
||||
|
||||
```javascript
|
||||
var Deployer = require('@0xproject/deployer').Deployer;
|
||||
var Compiler = require('@0xproject/deployer').Compiler;
|
||||
```
|
||||
|
||||
## Contributing
|
||||
|
||||
|
@@ -1,20 +1,36 @@
|
||||
{
|
||||
"name": "@0xproject/deployer",
|
||||
"version": "0.3.0",
|
||||
"version": "0.3.4",
|
||||
"description": "Smart contract deployer of 0x protocol",
|
||||
"main": "lib/src/index.js",
|
||||
"types": "lib/src/index.d.ts",
|
||||
"scripts": {
|
||||
"build:watch": "tsc -w",
|
||||
"build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
|
||||
"test": "npm run build; mocha lib/test/*_test.js",
|
||||
"test": "run-s build run_mocha",
|
||||
"run_mocha": "mocha lib/test/*_test.js",
|
||||
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
|
||||
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
|
||||
"compile": "npm run build; node lib/src/cli.js compile",
|
||||
"clean": "shx rm -rf lib scripts",
|
||||
"migrate": "npm run build; node lib/src/cli.js migrate",
|
||||
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
|
||||
"test:circleci": "yarn test:coverage"
|
||||
"test:circleci": "yarn test:coverage",
|
||||
"docs:stage": "yarn build && node ./scripts/stage_docs.js",
|
||||
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
|
||||
"upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
|
||||
},
|
||||
"config": {
|
||||
"postpublish": {
|
||||
"assets": [],
|
||||
"docPublishConfigs": {
|
||||
"extraFileIncludes": [
|
||||
"../types/src/index.ts"
|
||||
],
|
||||
"s3BucketPath": "s3://doc-jsons/deployer/",
|
||||
"s3StagingBucketPath": "s3://staging-doc-jsons/deployer/"
|
||||
}
|
||||
}
|
||||
},
|
||||
"bin": {
|
||||
"0x-deployer": "lib/src/cli.js"
|
||||
@@ -30,30 +46,35 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/deployer/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/require-from-string": "^1.2.0",
|
||||
"@types/semver": "^5.5.0",
|
||||
"@types/yargs": "^11.0.0",
|
||||
"chai": "^4.0.1",
|
||||
"copyfiles": "^1.2.0",
|
||||
"ethers-typescript-typings": "^0.0.3",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"mocha": "^4.0.1",
|
||||
"npm-run-all": "^4.1.2",
|
||||
"nyc": "^11.0.1",
|
||||
"shx": "^0.2.2",
|
||||
"tslint": "5.8.0",
|
||||
"typedoc": "0xProject/typedoc",
|
||||
"types-bn": "^0.0.1",
|
||||
"typescript": "2.7.1",
|
||||
"web3-typescript-typings": "^0.10.1"
|
||||
"web3-typescript-typings": "^0.10.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/json-schemas": "^0.7.15",
|
||||
"@0xproject/types": "^0.4.0",
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/web3-wrapper": "^0.3.0",
|
||||
"@0xproject/json-schemas": "^0.7.18",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"@0xproject/web3-wrapper": "^0.4.0",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
"lodash": "^4.17.4",
|
||||
"require-from-string": "^2.0.1",
|
||||
"semver": "^5.5.0",
|
||||
"solc": "^0.4.18",
|
||||
"web3": "^0.20.0",
|
||||
"web3-eth-abi": "^1.0.0-beta.24",
|
||||
|
1
packages/deployer/solc_bin/.gitignore
vendored
1
packages/deployer/solc_bin/.gitignore
vendored
@@ -1 +0,0 @@
|
||||
*.js
|
@@ -10,6 +10,7 @@ import * as yargs from 'yargs';
|
||||
|
||||
import { commands } from './commands';
|
||||
import { constants } from './utils/constants';
|
||||
import { consoleReporter } from './utils/error_reporter';
|
||||
import { CliOptions, CompilerOptions, DeployerOptions } from './utils/types';
|
||||
|
||||
const DEFAULT_OPTIMIZER_ENABLED = false;
|
||||
@@ -24,11 +25,11 @@ const DEFAULT_CONTRACTS_LIST = '*';
|
||||
* Compiles all contracts with options passed in through CLI.
|
||||
* @param argv Instance of process.argv provided by yargs.
|
||||
*/
|
||||
async function onCompileCommand(argv: CliOptions): Promise<void> {
|
||||
async function onCompileCommandAsync(argv: CliOptions): Promise<void> {
|
||||
const opts: CompilerOptions = {
|
||||
contractsDir: argv.contractsDir,
|
||||
networkId: argv.networkId,
|
||||
optimizerEnabled: argv.shouldOptimize ? 1 : 0,
|
||||
optimizerEnabled: argv.shouldOptimize,
|
||||
artifactsDir: argv.artifactsDir,
|
||||
specifiedContracts: getContractsSetFromList(argv.contracts),
|
||||
};
|
||||
@@ -38,7 +39,7 @@ async function onCompileCommand(argv: CliOptions): Promise<void> {
|
||||
* Deploys a single contract with provided name and args.
|
||||
* @param argv Instance of process.argv provided by yargs.
|
||||
*/
|
||||
async function onDeployCommand(argv: CliOptions): Promise<void> {
|
||||
async function onDeployCommandAsync(argv: CliOptions): Promise<void> {
|
||||
const url = argv.jsonrpcUrl;
|
||||
const web3Provider = new Web3.providers.HttpProvider(url);
|
||||
const web3Wrapper = new Web3Wrapper(web3Provider);
|
||||
@@ -46,7 +47,7 @@ async function onDeployCommand(argv: CliOptions): Promise<void> {
|
||||
const compilerOpts: CompilerOptions = {
|
||||
contractsDir: argv.contractsDir,
|
||||
networkId,
|
||||
optimizerEnabled: argv.shouldOptimize ? 1 : 0,
|
||||
optimizerEnabled: argv.shouldOptimize,
|
||||
artifactsDir: argv.artifactsDir,
|
||||
specifiedContracts: getContractsSetFromList(argv.contracts),
|
||||
};
|
||||
@@ -62,9 +63,9 @@ async function onDeployCommand(argv: CliOptions): Promise<void> {
|
||||
networkId,
|
||||
defaults,
|
||||
};
|
||||
const deployerArgsString = argv.args;
|
||||
const deployerArgsString = argv.args as string;
|
||||
const deployerArgs = deployerArgsString.split(',');
|
||||
await commands.deployAsync(argv.contract, deployerArgs, deployerOpts);
|
||||
await commands.deployAsync(argv.contract as string, deployerArgs, deployerOpts);
|
||||
}
|
||||
/**
|
||||
* Creates a set of contracts to compile.
|
||||
@@ -142,7 +143,12 @@ function deployCommandBuilder(yargsInstance: any) {
|
||||
default: DEFAULT_CONTRACTS_LIST,
|
||||
description: 'comma separated list of contracts to compile',
|
||||
})
|
||||
.command('compile', 'compile contracts', identityCommandBuilder, onCompileCommand)
|
||||
.command('deploy', 'deploy a single contract with provided arguments', deployCommandBuilder, onDeployCommand)
|
||||
.command('compile', 'compile contracts', identityCommandBuilder, consoleReporter(onCompileCommandAsync))
|
||||
.command(
|
||||
'deploy',
|
||||
'deploy a single contract with provided arguments',
|
||||
deployCommandBuilder,
|
||||
consoleReporter(onDeployCommandAsync),
|
||||
)
|
||||
.help().argv;
|
||||
})();
|
||||
|
@@ -5,7 +5,7 @@ import { CompilerOptions, DeployerOptions } from './utils/types';
|
||||
export const commands = {
|
||||
async compileAsync(opts: CompilerOptions): Promise<void> {
|
||||
const compiler = new Compiler(opts);
|
||||
await compiler.compileAllAsync();
|
||||
await compiler.compileAsync();
|
||||
},
|
||||
async deployAsync(contractName: string, args: any[], opts: DeployerOptions): Promise<void> {
|
||||
const deployer = new Deployer(opts);
|
||||
|
@@ -1,3 +1,4 @@
|
||||
import { ContractAbi } from '@0xproject/types';
|
||||
import { logUtils, promisify } from '@0xproject/utils';
|
||||
import * as ethUtil from 'ethereumjs-util';
|
||||
import * as fs from 'fs';
|
||||
@@ -5,10 +6,18 @@ import 'isomorphic-fetch';
|
||||
import * as _ from 'lodash';
|
||||
import * as path from 'path';
|
||||
import * as requireFromString from 'require-from-string';
|
||||
import * as semver from 'semver';
|
||||
import solc = require('solc');
|
||||
import * as Web3 from 'web3';
|
||||
|
||||
import { binPaths } from './solc/bin_paths';
|
||||
import {
|
||||
createDirIfDoesNotExistAsync,
|
||||
findImportIfExist,
|
||||
getContractArtifactIfExistsAsync,
|
||||
getNormalizedErrMsg,
|
||||
parseDependencies,
|
||||
parseSolidityVersionRange,
|
||||
} from './utils/compiler';
|
||||
import { constants } from './utils/constants';
|
||||
import { fsWrapper } from './utils/fs_wrapper';
|
||||
import {
|
||||
@@ -23,17 +32,19 @@ import {
|
||||
import { utils } from './utils/utils';
|
||||
|
||||
const ALL_CONTRACTS_IDENTIFIER = '*';
|
||||
const SOLIDITY_VERSION_REGEX = /(?:solidity\s\^?)(\d+\.\d+\.\d+)/;
|
||||
const SOLIDITY_FILE_EXTENSION_REGEX = /(.*\.sol)/;
|
||||
const IMPORT_REGEX = /(import\s)/;
|
||||
const DEPENDENCY_PATH_REGEX = /"([^"]+)"/; // Source: https://github.com/BlockChainCompany/soljitsu/blob/master/lib/shared.js
|
||||
const SOLC_BIN_DIR = path.join(__dirname, '..', '..', 'solc_bin');
|
||||
|
||||
/**
|
||||
* The Compiler facilitates compiling Solidity smart contracts and saves the results
|
||||
* to artifact files.
|
||||
*/
|
||||
export class Compiler {
|
||||
private _contractsDir: string;
|
||||
private _networkId: number;
|
||||
private _optimizerEnabled: number;
|
||||
private _optimizerEnabled: boolean;
|
||||
private _artifactsDir: string;
|
||||
private _contractSources?: ContractSources;
|
||||
// This get's set in the beggining of `compileAsync` function. It's not called from a constructor, but it's the only public method of that class and could as well be.
|
||||
private _contractSources!: ContractSources;
|
||||
private _solcErrors: Set<string> = new Set();
|
||||
private _specifiedContracts: Set<string> = new Set();
|
||||
private _contractSourceData: ContractSourceData = {};
|
||||
@@ -77,64 +88,6 @@ export class Compiler {
|
||||
}
|
||||
return sources;
|
||||
}
|
||||
/**
|
||||
* Gets contract dependendencies and keccak256 hash from source.
|
||||
* @param source Source code of contract.
|
||||
* @return Object with contract dependencies and keccak256 hash of source.
|
||||
*/
|
||||
private static _getContractSpecificSourceData(source: string): ContractSpecificSourceData {
|
||||
const dependencies: string[] = [];
|
||||
const sourceHash = ethUtil.sha3(source);
|
||||
const solcVersion = Compiler._parseSolidityVersion(source);
|
||||
const contractSpecificSourceData: ContractSpecificSourceData = {
|
||||
dependencies,
|
||||
solcVersion,
|
||||
sourceHash,
|
||||
};
|
||||
const lines = source.split('\n');
|
||||
_.forEach(lines, line => {
|
||||
if (!_.isNull(line.match(IMPORT_REGEX))) {
|
||||
const dependencyMatch = line.match(DEPENDENCY_PATH_REGEX);
|
||||
if (!_.isNull(dependencyMatch)) {
|
||||
const dependencyPath = dependencyMatch[1];
|
||||
const fileName = path.basename(dependencyPath);
|
||||
contractSpecificSourceData.dependencies.push(fileName);
|
||||
}
|
||||
}
|
||||
});
|
||||
return contractSpecificSourceData;
|
||||
}
|
||||
/**
|
||||
* Searches Solidity source code for compiler version.
|
||||
* @param source Source code of contract.
|
||||
* @return Solc compiler version.
|
||||
*/
|
||||
private static _parseSolidityVersion(source: string): string {
|
||||
const solcVersionMatch = source.match(SOLIDITY_VERSION_REGEX);
|
||||
if (_.isNull(solcVersionMatch)) {
|
||||
throw new Error('Could not find Solidity version in source');
|
||||
}
|
||||
const solcVersion = solcVersionMatch[1];
|
||||
return solcVersion;
|
||||
}
|
||||
/**
|
||||
* Normalizes the path found in the error message.
|
||||
* Example: converts 'base/Token.sol:6:46: Warning: Unused local variable'
|
||||
* to 'Token.sol:6:46: Warning: Unused local variable'
|
||||
* This is used to prevent logging the same error multiple times.
|
||||
* @param errMsg An error message from the compiled output.
|
||||
* @return The error message with directories truncated from the contract path.
|
||||
*/
|
||||
private static _getNormalizedErrMsg(errMsg: string): string {
|
||||
const errPathMatch = errMsg.match(SOLIDITY_FILE_EXTENSION_REGEX);
|
||||
if (_.isNull(errPathMatch)) {
|
||||
throw new Error('Could not find a path in error message');
|
||||
}
|
||||
const errPath = errPathMatch[0];
|
||||
const baseContract = path.basename(errPath);
|
||||
const normalizedErrMsg = errMsg.replace(errPath, baseContract);
|
||||
return normalizedErrMsg;
|
||||
}
|
||||
/**
|
||||
* Instantiates a new instance of the Compiler class.
|
||||
* @param opts Options specifying directories, network, and optimization settings.
|
||||
@@ -148,21 +101,19 @@ export class Compiler {
|
||||
this._specifiedContracts = opts.specifiedContracts;
|
||||
}
|
||||
/**
|
||||
* Compiles all Solidity files found in contractsDir and writes JSON artifacts to artifactsDir.
|
||||
* Compiles selected Solidity files found in `contractsDir` and writes JSON artifacts to `artifactsDir`.
|
||||
*/
|
||||
public async compileAllAsync(): Promise<void> {
|
||||
await this._createArtifactsDirIfDoesNotExistAsync();
|
||||
public async compileAsync(): Promise<void> {
|
||||
await createDirIfDoesNotExistAsync(this._artifactsDir);
|
||||
await createDirIfDoesNotExistAsync(SOLC_BIN_DIR);
|
||||
this._contractSources = await Compiler._getContractSourcesAsync(this._contractsDir);
|
||||
_.forIn(this._contractSources, (source, fileName) => {
|
||||
this._contractSourceData[fileName] = Compiler._getContractSpecificSourceData(source);
|
||||
});
|
||||
_.forIn(this._contractSources, this._setContractSpecificSourceData.bind(this));
|
||||
const fileNames = this._specifiedContracts.has(ALL_CONTRACTS_IDENTIFIER)
|
||||
? _.keys(this._contractSources)
|
||||
: Array.from(this._specifiedContracts.values());
|
||||
_.forEach(fileNames, fileName => {
|
||||
this._setSourceTreeHash(fileName);
|
||||
});
|
||||
await Promise.all(_.map(fileNames, async fileName => this._compileContractAsync(fileName)));
|
||||
for (const fileName of fileNames) {
|
||||
await this._compileContractAsync(fileName);
|
||||
}
|
||||
this._solcErrors.forEach(errMsg => {
|
||||
logUtils.log(errMsg);
|
||||
});
|
||||
@@ -176,20 +127,29 @@ export class Compiler {
|
||||
throw new Error('Contract sources not yet initialized');
|
||||
}
|
||||
const contractSpecificSourceData = this._contractSourceData[fileName];
|
||||
const currentArtifactIfExists = (await this._getContractArtifactIfExistsAsync(fileName)) as ContractArtifact;
|
||||
const currentArtifactIfExists = await getContractArtifactIfExistsAsync(this._artifactsDir, fileName);
|
||||
const sourceHash = `0x${contractSpecificSourceData.sourceHash.toString('hex')}`;
|
||||
const sourceTreeHash = `0x${contractSpecificSourceData.sourceTreeHashIfExists.toString('hex')}`;
|
||||
const sourceTreeHash = `0x${contractSpecificSourceData.sourceTreeHash.toString('hex')}`;
|
||||
|
||||
const shouldCompile =
|
||||
_.isUndefined(currentArtifactIfExists) ||
|
||||
currentArtifactIfExists.networks[this._networkId].optimizer_enabled !== this._optimizerEnabled ||
|
||||
currentArtifactIfExists.networks[this._networkId].source_tree_hash !== sourceTreeHash;
|
||||
let shouldCompile = false;
|
||||
if (_.isUndefined(currentArtifactIfExists)) {
|
||||
shouldCompile = true;
|
||||
} else {
|
||||
const currentArtifact = currentArtifactIfExists as ContractArtifact;
|
||||
shouldCompile =
|
||||
currentArtifact.networks[this._networkId].optimizer_enabled !== this._optimizerEnabled ||
|
||||
currentArtifact.networks[this._networkId].source_tree_hash !== sourceTreeHash;
|
||||
}
|
||||
if (!shouldCompile) {
|
||||
return;
|
||||
}
|
||||
|
||||
const fullSolcVersion = binPaths[contractSpecificSourceData.solcVersion];
|
||||
const compilerBinFilename = path.join(__dirname, '../../solc_bin', fullSolcVersion);
|
||||
const availableCompilerVersions = _.keys(binPaths);
|
||||
const solcVersion = semver.maxSatisfying(
|
||||
availableCompilerVersions,
|
||||
contractSpecificSourceData.solcVersionRange,
|
||||
);
|
||||
const fullSolcVersion = binPaths[solcVersion];
|
||||
const compilerBinFilename = path.join(SOLC_BIN_DIR, fullSolcVersion);
|
||||
let solcjs: string;
|
||||
const isCompilerAvailableLocally = fs.existsSync(compilerBinFilename);
|
||||
if (isCompilerAvailableLocally) {
|
||||
@@ -206,7 +166,7 @@ export class Compiler {
|
||||
}
|
||||
const solcInstance = solc.setupMethods(requireFromString(solcjs, compilerBinFilename));
|
||||
|
||||
logUtils.log(`Compiling ${fileName}...`);
|
||||
logUtils.log(`Compiling ${fileName} with Solidity v${solcVersion}...`);
|
||||
const source = this._contractSources[fileName];
|
||||
const input = {
|
||||
[fileName]: source,
|
||||
@@ -214,21 +174,24 @@ export class Compiler {
|
||||
const sourcesToCompile = {
|
||||
sources: input,
|
||||
};
|
||||
const compiled = solcInstance.compile(
|
||||
sourcesToCompile,
|
||||
this._optimizerEnabled,
|
||||
this._findImportsIfSourcesExist.bind(this),
|
||||
const compiled = solcInstance.compile(sourcesToCompile, Number(this._optimizerEnabled), importPath =>
|
||||
findImportIfExist(this._contractSources, importPath),
|
||||
);
|
||||
|
||||
if (!_.isUndefined(compiled.errors)) {
|
||||
_.forEach(compiled.errors, errMsg => {
|
||||
const normalizedErrMsg = Compiler._getNormalizedErrMsg(errMsg);
|
||||
const normalizedErrMsg = getNormalizedErrMsg(errMsg);
|
||||
this._solcErrors.add(normalizedErrMsg);
|
||||
});
|
||||
}
|
||||
const contractName = path.basename(fileName, constants.SOLIDITY_FILE_EXTENSION);
|
||||
const contractIdentifier = `${fileName}:${contractName}`;
|
||||
const abi: Web3.ContractAbi = JSON.parse(compiled.contracts[contractIdentifier].interface);
|
||||
if (_.isUndefined(compiled.contracts[contractIdentifier])) {
|
||||
throw new Error(
|
||||
`Contract ${contractName} not found in ${fileName}. Please make sure your contract has the same name as it's file name`,
|
||||
);
|
||||
}
|
||||
const abi: ContractAbi = JSON.parse(compiled.contracts[contractIdentifier].interface);
|
||||
const bytecode = `0x${compiled.contracts[contractIdentifier].bytecode}`;
|
||||
const runtimeBytecode = `0x${compiled.contracts[contractIdentifier].runtimeBytecode}`;
|
||||
const sourceMap = compiled.contracts[contractIdentifier].srcmap;
|
||||
@@ -236,7 +199,7 @@ export class Compiler {
|
||||
const sources = _.keys(compiled.sources);
|
||||
const updated_at = Date.now();
|
||||
const contractNetworkData: ContractNetworkData = {
|
||||
solc_version: contractSpecificSourceData.solcVersion,
|
||||
solc_version: solcVersion,
|
||||
keccak256: sourceHash,
|
||||
source_tree_hash: sourceTreeHash,
|
||||
optimizer_enabled: this._optimizerEnabled,
|
||||
@@ -251,10 +214,11 @@ export class Compiler {
|
||||
|
||||
let newArtifact: ContractArtifact;
|
||||
if (!_.isUndefined(currentArtifactIfExists)) {
|
||||
const currentArtifact = currentArtifactIfExists as ContractArtifact;
|
||||
newArtifact = {
|
||||
...currentArtifactIfExists,
|
||||
...currentArtifact,
|
||||
networks: {
|
||||
...currentArtifactIfExists.networks,
|
||||
...currentArtifact.networks,
|
||||
[this._networkId]: contractNetworkData,
|
||||
},
|
||||
};
|
||||
@@ -273,79 +237,42 @@ export class Compiler {
|
||||
logUtils.log(`${fileName} artifact saved!`);
|
||||
}
|
||||
/**
|
||||
* Sets the source tree hash for a file and its dependencies.
|
||||
* @param fileName Name of contract file.
|
||||
* Gets contract dependendencies and keccak256 hash from source.
|
||||
* @param source Source code of contract.
|
||||
* @return Object with contract dependencies and keccak256 hash of source.
|
||||
*/
|
||||
private _setSourceTreeHash(fileName: string): void {
|
||||
const contractSpecificSourceData = this._contractSourceData[fileName];
|
||||
if (_.isUndefined(contractSpecificSourceData)) {
|
||||
throw new Error(`Contract data for ${fileName} not yet set`);
|
||||
private _setContractSpecificSourceData(source: string, fileName: string): void {
|
||||
if (!_.isUndefined(this._contractSourceData[fileName])) {
|
||||
return;
|
||||
}
|
||||
if (_.isUndefined(contractSpecificSourceData.sourceTreeHashIfExists)) {
|
||||
const dependencies = contractSpecificSourceData.dependencies;
|
||||
if (dependencies.length === 0) {
|
||||
contractSpecificSourceData.sourceTreeHashIfExists = contractSpecificSourceData.sourceHash;
|
||||
} else {
|
||||
_.forEach(dependencies, dependency => {
|
||||
this._setSourceTreeHash(dependency);
|
||||
});
|
||||
const dependencySourceTreeHashes = _.map(
|
||||
dependencies,
|
||||
dependency => this._contractSourceData[dependency].sourceTreeHashIfExists,
|
||||
);
|
||||
const sourceTreeHashesBuffer = Buffer.concat([
|
||||
contractSpecificSourceData.sourceHash,
|
||||
...dependencySourceTreeHashes,
|
||||
]);
|
||||
contractSpecificSourceData.sourceTreeHashIfExists = ethUtil.sha3(sourceTreeHashesBuffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Callback to resolve dependencies with `solc.compile`.
|
||||
* Throws error if contractSources not yet initialized.
|
||||
* @param importPath Path to an imported dependency.
|
||||
* @return Import contents object containing source code of dependency.
|
||||
*/
|
||||
private _findImportsIfSourcesExist(importPath: string): solc.ImportContents {
|
||||
const fileName = path.basename(importPath);
|
||||
const source = this._contractSources[fileName];
|
||||
if (_.isUndefined(source)) {
|
||||
throw new Error(`Contract source not found for ${fileName}`);
|
||||
}
|
||||
const importContents: solc.ImportContents = {
|
||||
contents: source,
|
||||
const sourceHash = ethUtil.sha3(source);
|
||||
const solcVersionRange = parseSolidityVersionRange(source);
|
||||
const dependencies = parseDependencies(source);
|
||||
const sourceTreeHash = this._getSourceTreeHash(fileName, sourceHash, dependencies);
|
||||
this._contractSourceData[fileName] = {
|
||||
dependencies,
|
||||
solcVersionRange,
|
||||
sourceHash,
|
||||
sourceTreeHash,
|
||||
};
|
||||
return importContents;
|
||||
}
|
||||
/**
|
||||
* Creates the artifacts directory if it does not already exist.
|
||||
*/
|
||||
private async _createArtifactsDirIfDoesNotExistAsync(): Promise<void> {
|
||||
if (!fsWrapper.doesPathExistSync(this._artifactsDir)) {
|
||||
logUtils.log('Creating artifacts directory...');
|
||||
await fsWrapper.mkdirAsync(this._artifactsDir);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Gets contract data on network or returns if an artifact does not exist.
|
||||
* Gets the source tree hash for a file and its dependencies.
|
||||
* @param fileName Name of contract file.
|
||||
* @return Contract data on network or undefined.
|
||||
*/
|
||||
private async _getContractArtifactIfExistsAsync(fileName: string): Promise<ContractArtifact | void> {
|
||||
let contractArtifact;
|
||||
const contractName = path.basename(fileName, constants.SOLIDITY_FILE_EXTENSION);
|
||||
const currentArtifactPath = `${this._artifactsDir}/${contractName}.json`;
|
||||
try {
|
||||
const opts = {
|
||||
encoding: 'utf8',
|
||||
};
|
||||
const contractArtifactString = await fsWrapper.readFileAsync(currentArtifactPath, opts);
|
||||
contractArtifact = JSON.parse(contractArtifactString);
|
||||
return contractArtifact;
|
||||
} catch (err) {
|
||||
logUtils.log(`Artifact for ${fileName} does not exist`);
|
||||
return undefined;
|
||||
private _getSourceTreeHash(fileName: string, sourceHash: Buffer, dependencies: string[]): Buffer {
|
||||
if (dependencies.length === 0) {
|
||||
return sourceHash;
|
||||
} else {
|
||||
const dependencySourceTreeHashes = _.map(dependencies, dependency => {
|
||||
const source = this._contractSources[dependency];
|
||||
this._setContractSpecificSourceData(source, dependency);
|
||||
const sourceData = this._contractSourceData[dependency];
|
||||
return this._getSourceTreeHash(dependency, sourceData.sourceHash, sourceData.dependencies);
|
||||
});
|
||||
const sourceTreeHashesBuffer = Buffer.concat([sourceHash, ...dependencySourceTreeHashes]);
|
||||
const sourceTreeHash = ethUtil.sha3(sourceTreeHashesBuffer);
|
||||
return sourceTreeHash;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { AbiType, TxData } from '@0xproject/types';
|
||||
import { AbiType, ConstructorAbi, ContractAbi, TxData } from '@0xproject/types';
|
||||
import { logUtils } from '@0xproject/utils';
|
||||
import { Web3Wrapper } from '@0xproject/web3-wrapper';
|
||||
import * as _ from 'lodash';
|
||||
@@ -19,12 +19,21 @@ import { utils } from './utils/utils';
|
||||
// Gas added to gas estimate to make sure there is sufficient gas for deployment.
|
||||
const EXTRA_GAS = 200000;
|
||||
|
||||
/**
|
||||
* The Deployer facilitates deploying Solidity smart contracts to the blockchain.
|
||||
* It can be used to build custom migration scripts.
|
||||
*/
|
||||
export class Deployer {
|
||||
public web3Wrapper: Web3Wrapper;
|
||||
private _artifactsDir: string;
|
||||
private _networkId: number;
|
||||
private _defaults: Partial<TxData>;
|
||||
|
||||
/**
|
||||
* Instantiate a new instance of the Deployer class.
|
||||
* @param opts Deployer options, including either an RPC url or Provider instance.
|
||||
* @returns A Deployer instance
|
||||
*/
|
||||
constructor(opts: DeployerOptions) {
|
||||
this._artifactsDir = opts.artifactsDir;
|
||||
this._networkId = opts.networkId;
|
||||
@@ -42,8 +51,8 @@ export class Deployer {
|
||||
this.web3Wrapper = new Web3Wrapper(web3Provider, this._defaults);
|
||||
}
|
||||
/**
|
||||
* Loads contract artifact and deploys contract with given arguments.
|
||||
* @param contractName Name of the contract to deploy. Must match name of an artifact in artifacts directory.
|
||||
* Loads a contract's corresponding artifacts and deploys it with the supplied constructor arguments.
|
||||
* @param contractName Name of the contract to deploy. Must match name of an artifact in supplied artifacts directory.
|
||||
* @param args Array of contract constructor arguments.
|
||||
* @return Deployed contract instance.
|
||||
*/
|
||||
@@ -62,7 +71,7 @@ export class Deployer {
|
||||
gas,
|
||||
};
|
||||
const abi = contractNetworkDataIfExists.abi;
|
||||
const constructorAbi = _.find(abi, { type: AbiType.Constructor }) as Web3.ConstructorAbi;
|
||||
const constructorAbi = _.find(abi, { type: AbiType.Constructor }) as ConstructorAbi;
|
||||
const constructorArgs = _.isUndefined(constructorAbi) ? [] : constructorAbi.inputs;
|
||||
if (constructorArgs.length !== args.length) {
|
||||
const constructorSignature = `constructor(${_.map(constructorArgs, arg => `${arg.type} ${arg.name}`).join(
|
||||
@@ -80,7 +89,8 @@ export class Deployer {
|
||||
return contractInstance;
|
||||
}
|
||||
/**
|
||||
* Loads contract artifact, deploys with given arguments, and saves updated data to artifact.
|
||||
* Loads a contract's artifact, deploys it with supplied constructor arguments, and saves the updated data
|
||||
* back to the artifact file.
|
||||
* @param contractName Name of the contract to deploy. Must match name of an artifact in artifacts directory.
|
||||
* @param args Array of contract constructor arguments.
|
||||
* @return Deployed contract instance.
|
||||
@@ -97,7 +107,7 @@ export class Deployer {
|
||||
* @param txData Tx options used for deployment.
|
||||
* @return Promise that resolves to a web3 contract instance.
|
||||
*/
|
||||
private async _deployFromAbiAsync(abi: Web3.ContractAbi, args: any[], txData: Web3.TxData): Promise<any> {
|
||||
private async _deployFromAbiAsync(abi: ContractAbi, args: any[], txData: TxData): Promise<any> {
|
||||
const contract: Web3.Contract<Web3.ContractInstance> = this.web3Wrapper.getContractFromAbi(abi);
|
||||
const deployPromise = new Promise((resolve, reject) => {
|
||||
/**
|
||||
|
3
packages/deployer/src/globals.d.ts
vendored
3
packages/deployer/src/globals.d.ts
vendored
@@ -1,6 +1,7 @@
|
||||
declare module 'dirty-chai';
|
||||
|
||||
// tslint:disable:completed-docs
|
||||
declare module 'solc' {
|
||||
import * as Web3 from 'web3';
|
||||
export interface ContractCompilationResult {
|
||||
srcmap: string;
|
||||
srcmapRuntime: string;
|
||||
|
@@ -5,4 +5,4 @@ import * as tsConfigJSON from '../tsconfig.json';
|
||||
|
||||
const cwd = `${__dirname}/..`;
|
||||
// tslint:disable-next-line:no-floating-promises
|
||||
postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
|
||||
postpublishUtils.publishDocsToStagingAsync(packageJSON, tsConfigJSON, cwd);
|
123
packages/deployer/src/utils/compiler.ts
Normal file
123
packages/deployer/src/utils/compiler.ts
Normal file
@@ -0,0 +1,123 @@
|
||||
import { logUtils } from '@0xproject/utils';
|
||||
import * as _ from 'lodash';
|
||||
import * as path from 'path';
|
||||
import * as solc from 'solc';
|
||||
|
||||
import { constants } from './constants';
|
||||
import { fsWrapper } from './fs_wrapper';
|
||||
import { ContractArtifact, ContractSources } from './types';
|
||||
|
||||
/**
|
||||
* Gets contract data on network or returns if an artifact does not exist.
|
||||
* @param artifactsDir Path to the artifacts directory.
|
||||
* @param fileName Name of contract file.
|
||||
* @return Contract data on network or undefined.
|
||||
*/
|
||||
export async function getContractArtifactIfExistsAsync(
|
||||
artifactsDir: string,
|
||||
fileName: string,
|
||||
): Promise<ContractArtifact | void> {
|
||||
let contractArtifact;
|
||||
const contractName = path.basename(fileName, constants.SOLIDITY_FILE_EXTENSION);
|
||||
const currentArtifactPath = `${artifactsDir}/${contractName}.json`;
|
||||
try {
|
||||
const opts = {
|
||||
encoding: 'utf8',
|
||||
};
|
||||
const contractArtifactString = await fsWrapper.readFileAsync(currentArtifactPath, opts);
|
||||
contractArtifact = JSON.parse(contractArtifactString);
|
||||
return contractArtifact;
|
||||
} catch (err) {
|
||||
logUtils.log(`Artifact for ${fileName} does not exist`);
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a directory if it does not already exist.
|
||||
* @param artifactsDir Path to the directory.
|
||||
*/
|
||||
export async function createDirIfDoesNotExistAsync(dirPath: string): Promise<void> {
|
||||
if (!fsWrapper.doesPathExistSync(dirPath)) {
|
||||
logUtils.log(`Creating directory at ${dirPath}...`);
|
||||
await fsWrapper.mkdirAsync(dirPath);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Searches Solidity source code for compiler version range.
|
||||
* @param source Source code of contract.
|
||||
* @return Solc compiler version range.
|
||||
*/
|
||||
export function parseSolidityVersionRange(source: string): string {
|
||||
const SOLIDITY_VERSION_RANGE_REGEX = /pragma\s+solidity\s+(.*);/;
|
||||
const solcVersionRangeMatch = source.match(SOLIDITY_VERSION_RANGE_REGEX);
|
||||
if (_.isNull(solcVersionRangeMatch)) {
|
||||
throw new Error('Could not find Solidity version range in source');
|
||||
}
|
||||
const solcVersionRange = solcVersionRangeMatch[1];
|
||||
return solcVersionRange;
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalizes the path found in the error message.
|
||||
* Example: converts 'base/Token.sol:6:46: Warning: Unused local variable'
|
||||
* to 'Token.sol:6:46: Warning: Unused local variable'
|
||||
* This is used to prevent logging the same error multiple times.
|
||||
* @param errMsg An error message from the compiled output.
|
||||
* @return The error message with directories truncated from the contract path.
|
||||
*/
|
||||
export function getNormalizedErrMsg(errMsg: string): string {
|
||||
const SOLIDITY_FILE_EXTENSION_REGEX = /(.*\.sol)/;
|
||||
const errPathMatch = errMsg.match(SOLIDITY_FILE_EXTENSION_REGEX);
|
||||
if (_.isNull(errPathMatch)) {
|
||||
throw new Error('Could not find a path in error message');
|
||||
}
|
||||
const errPath = errPathMatch[0];
|
||||
const baseContract = path.basename(errPath);
|
||||
const normalizedErrMsg = errMsg.replace(errPath, baseContract);
|
||||
return normalizedErrMsg;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses the contract source code and extracts the dendencies
|
||||
* @param source Contract source code
|
||||
* @return List of dependendencies
|
||||
*/
|
||||
export function parseDependencies(source: string): string[] {
|
||||
// TODO: Use a proper parser
|
||||
const IMPORT_REGEX = /(import\s)/;
|
||||
const DEPENDENCY_PATH_REGEX = /"([^"]+)"/; // Source: https://github.com/BlockChainCompany/soljitsu/blob/master/lib/shared.js
|
||||
const dependencies: string[] = [];
|
||||
const lines = source.split('\n');
|
||||
_.forEach(lines, line => {
|
||||
if (!_.isNull(line.match(IMPORT_REGEX))) {
|
||||
const dependencyMatch = line.match(DEPENDENCY_PATH_REGEX);
|
||||
if (!_.isNull(dependencyMatch)) {
|
||||
const dependencyPath = dependencyMatch[1];
|
||||
const basenName = path.basename(dependencyPath);
|
||||
dependencies.push(basenName);
|
||||
}
|
||||
}
|
||||
});
|
||||
return dependencies;
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback to resolve dependencies with `solc.compile`.
|
||||
* Throws error if contractSources not yet initialized.
|
||||
* @param contractSources Source codes of contracts.
|
||||
* @param importPath Path to an imported dependency.
|
||||
* @return Import contents object containing source code of dependency.
|
||||
*/
|
||||
export function findImportIfExist(contractSources: ContractSources, importPath: string): solc.ImportContents {
|
||||
const fileName = path.basename(importPath);
|
||||
const source = contractSources[fileName];
|
||||
if (_.isUndefined(source)) {
|
||||
throw new Error(`Contract source not found for ${fileName}`);
|
||||
}
|
||||
const importContents: solc.ImportContents = {
|
||||
contents: source,
|
||||
};
|
||||
return importContents;
|
||||
}
|
@@ -1,4 +1,5 @@
|
||||
import { schemas, SchemaValidator } from '@0xproject/json-schemas';
|
||||
import { ContractAbi, EventAbi, FunctionAbi, MethodAbi, TxData } from '@0xproject/types';
|
||||
import { promisify } from '@0xproject/utils';
|
||||
import * as _ from 'lodash';
|
||||
import * as Web3 from 'web3';
|
||||
@@ -7,14 +8,14 @@ import { AbiType } from './types';
|
||||
|
||||
export class Contract implements Web3.ContractInstance {
|
||||
public address: string;
|
||||
public abi: Web3.ContractAbi;
|
||||
public abi: ContractAbi;
|
||||
private _contract: Web3.ContractInstance;
|
||||
private _defaults: Partial<Web3.TxData>;
|
||||
private _defaults: Partial<TxData>;
|
||||
private _validator: SchemaValidator;
|
||||
// This class instance is going to be populated with functions and events depending on the ABI
|
||||
// and we don't know their types in advance
|
||||
[name: string]: any;
|
||||
constructor(web3ContractInstance: Web3.ContractInstance, defaults: Partial<Web3.TxData>) {
|
||||
constructor(web3ContractInstance: Web3.ContractInstance, defaults: Partial<TxData>) {
|
||||
this._contract = web3ContractInstance;
|
||||
this.address = web3ContractInstance.address;
|
||||
this.abi = web3ContractInstance.abi;
|
||||
@@ -24,8 +25,8 @@ export class Contract implements Web3.ContractInstance {
|
||||
this._validator = new SchemaValidator();
|
||||
}
|
||||
private _populateFunctions(): void {
|
||||
const functionsAbi = _.filter(this.abi, abiPart => abiPart.type === AbiType.Function) as Web3.FunctionAbi[];
|
||||
_.forEach(functionsAbi, (functionAbi: Web3.MethodAbi) => {
|
||||
const functionsAbi = _.filter(this.abi, abiPart => abiPart.type === AbiType.Function) as FunctionAbi[];
|
||||
_.forEach(functionsAbi, (functionAbi: MethodAbi) => {
|
||||
if (functionAbi.constant) {
|
||||
const cbStyleCallFunction = this._contract[functionAbi.name].call;
|
||||
this[functionAbi.name] = promisify(cbStyleCallFunction, this._contract);
|
||||
@@ -42,8 +43,8 @@ export class Contract implements Web3.ContractInstance {
|
||||
});
|
||||
}
|
||||
private _populateEvents(): void {
|
||||
const eventsAbi = _.filter(this.abi, abiPart => abiPart.type === AbiType.Event) as Web3.EventAbi[];
|
||||
_.forEach(eventsAbi, (eventAbi: Web3.EventAbi) => {
|
||||
const eventsAbi = _.filter(this.abi, abiPart => abiPart.type === AbiType.Event) as EventAbi[];
|
||||
_.forEach(eventsAbi, (eventAbi: EventAbi) => {
|
||||
this[eventAbi.name] = this._contract[eventAbi.name];
|
||||
});
|
||||
}
|
||||
@@ -51,7 +52,7 @@ export class Contract implements Web3.ContractInstance {
|
||||
const promisifiedWithDefaultParams = async (...args: any[]) => {
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
const lastArg = args[args.length - 1];
|
||||
let txData: Partial<Web3.TxData> = {};
|
||||
let txData: Partial<TxData> = {};
|
||||
if (this._isTxData(lastArg)) {
|
||||
txData = args.pop();
|
||||
}
|
||||
|
@@ -1,15 +1,15 @@
|
||||
import { AbiDefinition, ContractAbi, DataItem } from '@0xproject/types';
|
||||
import * as _ from 'lodash';
|
||||
import * as Web3 from 'web3';
|
||||
import * as web3Abi from 'web3-eth-abi';
|
||||
|
||||
import { AbiType } from './types';
|
||||
|
||||
export const encoder = {
|
||||
encodeConstructorArgsFromAbi(args: any[], abi: Web3.ContractAbi): string {
|
||||
encodeConstructorArgsFromAbi(args: any[], abi: ContractAbi): string {
|
||||
const constructorTypes: string[] = [];
|
||||
_.each(abi, (element: Web3.AbiDefinition) => {
|
||||
_.each(abi, (element: AbiDefinition) => {
|
||||
if (element.type === AbiType.Constructor) {
|
||||
_.each(element.inputs, (input: Web3.DataItem) => {
|
||||
_.each(element.inputs, (input: DataItem) => {
|
||||
constructorTypes.push(input.type);
|
||||
});
|
||||
}
|
||||
|
18
packages/deployer/src/utils/error_reporter.ts
Normal file
18
packages/deployer/src/utils/error_reporter.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import { logUtils } from '@0xproject/utils';
|
||||
|
||||
/**
|
||||
* Makes an async function no-throw printing errors to the console
|
||||
* @param asyncFn async function to wrap
|
||||
* @return Wrapped version of the passed function
|
||||
*/
|
||||
export function consoleReporter<T>(asyncFn: (arg: T) => Promise<void>): (arg: T) => Promise<void> {
|
||||
const noThrowFnAsync = async (arg: T) => {
|
||||
try {
|
||||
const result = await asyncFn(arg);
|
||||
return result;
|
||||
} catch (err) {
|
||||
logUtils.log(`${err}`);
|
||||
}
|
||||
};
|
||||
return noThrowFnAsync;
|
||||
}
|
@@ -7,5 +7,6 @@ export const fsWrapper = {
|
||||
writeFileAsync: promisify<undefined>(fs.writeFile),
|
||||
mkdirAsync: promisify<undefined>(fs.mkdir),
|
||||
doesPathExistSync: fs.existsSync,
|
||||
rmdirSync: fs.rmdirSync,
|
||||
removeFileAsync: promisify<undefined>(fs.unlink),
|
||||
};
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { TxData } from '@0xproject/types';
|
||||
import { ContractAbi, TxData } from '@0xproject/types';
|
||||
import * as Web3 from 'web3';
|
||||
import * as yargs from 'yargs';
|
||||
|
||||
@@ -20,10 +20,10 @@ export interface ContractNetworks {
|
||||
|
||||
export interface ContractNetworkData {
|
||||
solc_version: string;
|
||||
optimizer_enabled: number;
|
||||
optimizer_enabled: boolean;
|
||||
keccak256: string;
|
||||
source_tree_hash: string;
|
||||
abi: Web3.ContractAbi;
|
||||
abi: ContractAbi;
|
||||
bytecode: string;
|
||||
runtime_bytecode: string;
|
||||
address?: string;
|
||||
@@ -53,7 +53,7 @@ export interface CliOptions extends yargs.Arguments {
|
||||
export interface CompilerOptions {
|
||||
contractsDir: string;
|
||||
networkId: number;
|
||||
optimizerEnabled: number;
|
||||
optimizerEnabled: boolean;
|
||||
artifactsDir: string;
|
||||
specifiedContracts: Set<string>;
|
||||
}
|
||||
@@ -84,27 +84,9 @@ export interface ContractSourceData {
|
||||
|
||||
export interface ContractSpecificSourceData {
|
||||
dependencies: string[];
|
||||
solcVersion: string;
|
||||
solcVersionRange: string;
|
||||
sourceHash: Buffer;
|
||||
sourceTreeHashIfExists?: Buffer;
|
||||
}
|
||||
|
||||
// TODO: Consolidate with 0x.js definitions once types are moved into a separate package.
|
||||
export enum ZeroExError {
|
||||
ContractDoesNotExist = 'CONTRACT_DOES_NOT_EXIST',
|
||||
ExchangeContractDoesNotExist = 'EXCHANGE_CONTRACT_DOES_NOT_EXIST',
|
||||
UnhandledError = 'UNHANDLED_ERROR',
|
||||
UserHasNoAssociatedAddress = 'USER_HAS_NO_ASSOCIATED_ADDRESSES',
|
||||
InvalidSignature = 'INVALID_SIGNATURE',
|
||||
ContractNotDeployedOnNetwork = 'CONTRACT_NOT_DEPLOYED_ON_NETWORK',
|
||||
InsufficientAllowanceForTransfer = 'INSUFFICIENT_ALLOWANCE_FOR_TRANSFER',
|
||||
InsufficientBalanceForTransfer = 'INSUFFICIENT_BALANCE_FOR_TRANSFER',
|
||||
InsufficientEthBalanceForDeposit = 'INSUFFICIENT_ETH_BALANCE_FOR_DEPOSIT',
|
||||
InsufficientWEthBalanceForWithdrawal = 'INSUFFICIENT_WETH_BALANCE_FOR_WITHDRAWAL',
|
||||
InvalidJump = 'INVALID_JUMP',
|
||||
OutOfGas = 'OUT_OF_GAS',
|
||||
NoNetworkId = 'NO_NETWORK_ID',
|
||||
SubscriptionNotFound = 'SUBSCRIPTION_NOT_FOUND',
|
||||
sourceTreeHash: Buffer;
|
||||
}
|
||||
|
||||
export interface Token {
|
||||
|
47
packages/deployer/test/compiler_test.ts
Normal file
47
packages/deployer/test/compiler_test.ts
Normal file
@@ -0,0 +1,47 @@
|
||||
import * as chai from 'chai';
|
||||
import 'mocha';
|
||||
|
||||
import { Compiler } from '../src/compiler';
|
||||
import { fsWrapper } from '../src/utils/fs_wrapper';
|
||||
import { CompilerOptions, ContractArtifact, ContractNetworkData, DoneCallback } from '../src/utils/types';
|
||||
|
||||
import { exchange_binary } from './fixtures/exchange_bin';
|
||||
import { constants } from './util/constants';
|
||||
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('#Compiler', function() {
|
||||
this.timeout(constants.timeoutMs);
|
||||
const artifactsDir = `${__dirname}/fixtures/artifacts`;
|
||||
const contractsDir = `${__dirname}/fixtures/contracts`;
|
||||
const exchangeArtifactPath = `${artifactsDir}/Exchange.json`;
|
||||
const compilerOpts: CompilerOptions = {
|
||||
artifactsDir,
|
||||
contractsDir,
|
||||
networkId: constants.networkId,
|
||||
optimizerEnabled: constants.optimizerEnabled,
|
||||
specifiedContracts: new Set(constants.specifiedContracts),
|
||||
};
|
||||
const compiler = new Compiler(compilerOpts);
|
||||
beforeEach((done: DoneCallback) => {
|
||||
(async () => {
|
||||
if (fsWrapper.doesPathExistSync(exchangeArtifactPath)) {
|
||||
await fsWrapper.removeFileAsync(exchangeArtifactPath);
|
||||
}
|
||||
await compiler.compileAsync();
|
||||
done();
|
||||
})().catch(done);
|
||||
});
|
||||
it('should create an Exchange artifact with the correct unlinked binary', async () => {
|
||||
const opts = {
|
||||
encoding: 'utf8',
|
||||
};
|
||||
const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
|
||||
const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
|
||||
const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
|
||||
// The last 43 bytes of the binaries are metadata which may not be equivalent
|
||||
const unlinkedBinaryWithoutMetadata = exchangeContractData.bytecode.slice(0, -86);
|
||||
const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, -86);
|
||||
expect(unlinkedBinaryWithoutMetadata).to.equal(exchangeBinaryWithoutMetadata);
|
||||
});
|
||||
});
|
74
packages/deployer/test/compiler_utils_test.ts
Normal file
74
packages/deployer/test/compiler_utils_test.ts
Normal file
@@ -0,0 +1,74 @@
|
||||
import * as chai from 'chai';
|
||||
import * as dirtyChai from 'dirty-chai';
|
||||
import 'mocha';
|
||||
|
||||
import {
|
||||
createDirIfDoesNotExistAsync,
|
||||
getNormalizedErrMsg,
|
||||
parseDependencies,
|
||||
parseSolidityVersionRange,
|
||||
} from '../src/utils/compiler';
|
||||
import { fsWrapper } from '../src/utils/fs_wrapper';
|
||||
|
||||
chai.use(dirtyChai);
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('Compiler utils', () => {
|
||||
describe('#getNormalizedErrorMessage', () => {
|
||||
it('normalizes the error message', () => {
|
||||
const errMsg = 'base/Token.sol:6:46: Warning: Unused local variable';
|
||||
const normalizedErrMsg = getNormalizedErrMsg(errMsg);
|
||||
expect(normalizedErrMsg).to.be.equal('Token.sol:6:46: Warning: Unused local variable');
|
||||
});
|
||||
});
|
||||
describe('#createDirIfDoesNotExistAsync', () => {
|
||||
it('creates artifacts dir', async () => {
|
||||
const artifactsDir = `${__dirname}/artifacts`;
|
||||
expect(fsWrapper.doesPathExistSync(artifactsDir)).to.be.false();
|
||||
await createDirIfDoesNotExistAsync(artifactsDir);
|
||||
expect(fsWrapper.doesPathExistSync(artifactsDir)).to.be.true();
|
||||
fsWrapper.rmdirSync(artifactsDir);
|
||||
expect(fsWrapper.doesPathExistSync(artifactsDir)).to.be.false();
|
||||
});
|
||||
});
|
||||
describe('#parseSolidityVersionRange', () => {
|
||||
it('correctly parses the version range', () => {
|
||||
expect(parseSolidityVersionRange('pragma solidity ^0.0.1;')).to.be.equal('^0.0.1');
|
||||
expect(parseSolidityVersionRange('\npragma solidity 0.0.1;')).to.be.equal('0.0.1');
|
||||
expect(parseSolidityVersionRange('pragma solidity <=1.0.1;')).to.be.equal('<=1.0.1');
|
||||
expect(parseSolidityVersionRange('pragma solidity ~1.0.1;')).to.be.equal('~1.0.1');
|
||||
});
|
||||
// TODO: For now that doesn't work. This will work after we switch to a grammar-based parser
|
||||
it.skip('correctly parses the version range with comments', () => {
|
||||
expect(parseSolidityVersionRange('// pragma solidity ~1.0.1;\npragma solidity ~1.0.2;')).to.be.equal(
|
||||
'~1.0.2',
|
||||
);
|
||||
});
|
||||
});
|
||||
describe('#parseDependencies', () => {
|
||||
it('correctly parses Exchange dependencies', async () => {
|
||||
const exchangeSource = await fsWrapper.readFileAsync(`${__dirname}/fixtures/contracts/Exchange.sol`, {
|
||||
encoding: 'utf8',
|
||||
});
|
||||
expect(parseDependencies(exchangeSource)).to.be.deep.equal([
|
||||
'TokenTransferProxy.sol',
|
||||
'Token.sol',
|
||||
'SafeMath.sol',
|
||||
]);
|
||||
});
|
||||
it('correctly parses TokenTransferProxy dependencies', async () => {
|
||||
const exchangeSource = await fsWrapper.readFileAsync(
|
||||
`${__dirname}/fixtures/contracts/TokenTransferProxy.sol`,
|
||||
{
|
||||
encoding: 'utf8',
|
||||
},
|
||||
);
|
||||
expect(parseDependencies(exchangeSource)).to.be.deep.equal(['Token.sol', 'Ownable.sol']);
|
||||
});
|
||||
// TODO: For now that doesn't work. This will work after we switch to a grammar-based parser
|
||||
it.skip('correctly parses commented out dependencies', async () => {
|
||||
const contractWithCommentedOutDependencies = `// import "./TokenTransferProxy.sol";`;
|
||||
expect(parseDependencies(contractWithCommentedOutDependencies)).to.be.deep.equal([]);
|
||||
});
|
||||
});
|
||||
});
|
@@ -10,55 +10,38 @@ import { constructor_args, exchange_binary } from './fixtures/exchange_bin';
|
||||
import { constants } from './util/constants';
|
||||
|
||||
const expect = chai.expect;
|
||||
const artifactsDir = `${__dirname}/fixtures/artifacts`;
|
||||
const contractsDir = `${__dirname}/fixtures/contracts`;
|
||||
const exchangeArtifactPath = `${artifactsDir}/Exchange.json`;
|
||||
const compilerOpts: CompilerOptions = {
|
||||
artifactsDir,
|
||||
contractsDir,
|
||||
networkId: constants.networkId,
|
||||
optimizerEnabled: constants.optimizerEnabled,
|
||||
specifiedContracts: new Set(constants.specifiedContracts),
|
||||
};
|
||||
const compiler = new Compiler(compilerOpts);
|
||||
const deployerOpts = {
|
||||
artifactsDir,
|
||||
networkId: constants.networkId,
|
||||
jsonrpcUrl: constants.jsonrpcUrl,
|
||||
defaults: {
|
||||
gasPrice: constants.gasPrice,
|
||||
},
|
||||
};
|
||||
const deployer = new Deployer(deployerOpts);
|
||||
|
||||
/* tslint:disable */
|
||||
beforeEach(function(done: DoneCallback) {
|
||||
this.timeout(constants.timeoutMs);
|
||||
(async () => {
|
||||
if (fsWrapper.doesPathExistSync(exchangeArtifactPath)) {
|
||||
await fsWrapper.removeFileAsync(exchangeArtifactPath);
|
||||
}
|
||||
await compiler.compileAllAsync();
|
||||
done();
|
||||
})().catch(done);
|
||||
});
|
||||
/* tslint:enable */
|
||||
|
||||
describe('#Compiler', () => {
|
||||
it('should create an Exchange artifact with the correct unlinked binary', async () => {
|
||||
const opts = {
|
||||
encoding: 'utf8',
|
||||
};
|
||||
const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
|
||||
const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
|
||||
const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
|
||||
// The last 43 bytes of the binaries are metadata which may not be equivalent
|
||||
const unlinkedBinaryWithoutMetadata = exchangeContractData.bytecode.slice(0, -86);
|
||||
const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, -86);
|
||||
expect(unlinkedBinaryWithoutMetadata).to.equal(exchangeBinaryWithoutMetadata);
|
||||
});
|
||||
});
|
||||
describe('#Deployer', () => {
|
||||
const artifactsDir = `${__dirname}/fixtures/artifacts`;
|
||||
const contractsDir = `${__dirname}/fixtures/contracts`;
|
||||
const exchangeArtifactPath = `${artifactsDir}/Exchange.json`;
|
||||
const compilerOpts: CompilerOptions = {
|
||||
artifactsDir,
|
||||
contractsDir,
|
||||
networkId: constants.networkId,
|
||||
optimizerEnabled: constants.optimizerEnabled,
|
||||
specifiedContracts: new Set(constants.specifiedContracts),
|
||||
};
|
||||
const compiler = new Compiler(compilerOpts);
|
||||
const deployerOpts = {
|
||||
artifactsDir,
|
||||
networkId: constants.networkId,
|
||||
jsonrpcUrl: constants.jsonrpcUrl,
|
||||
defaults: {
|
||||
gasPrice: constants.gasPrice,
|
||||
},
|
||||
};
|
||||
const deployer = new Deployer(deployerOpts);
|
||||
beforeEach(function(done: DoneCallback) {
|
||||
this.timeout(constants.timeoutMs);
|
||||
(async () => {
|
||||
if (fsWrapper.doesPathExistSync(exchangeArtifactPath)) {
|
||||
await fsWrapper.removeFileAsync(exchangeArtifactPath);
|
||||
}
|
||||
await compiler.compileAsync();
|
||||
done();
|
||||
})().catch(done);
|
||||
});
|
||||
describe('#deployAsync', () => {
|
||||
it('should deploy the Exchange contract without updating the Exchange artifact', async () => {
|
||||
const exchangeConstructorArgs = [constants.zrxTokenAddress, constants.tokenTransferProxyAddress];
|
@@ -3,7 +3,7 @@ import { BigNumber } from '@0xproject/utils';
|
||||
export const constants = {
|
||||
networkId: 0,
|
||||
jsonrpcUrl: 'http://localhost:8545',
|
||||
optimizerEnabled: 0,
|
||||
optimizerEnabled: false,
|
||||
gasPrice: new BigNumber(20000000000),
|
||||
timeoutMs: 20000,
|
||||
zrxTokenAddress: '0xe41d2489571d322189246dafa5ebde1f4699f498',
|
||||
|
@@ -2,16 +2,12 @@
|
||||
"extends": "../../tsconfig",
|
||||
"compilerOptions": {
|
||||
"outDir": "lib",
|
||||
"strictFunctionTypes": false,
|
||||
"strictNullChecks": false
|
||||
"strictFunctionTypes": false
|
||||
},
|
||||
"include": [
|
||||
"./src/**/*",
|
||||
"./test/**/*",
|
||||
"../../node_modules/types-bn/index.d.ts",
|
||||
"../../node_modules/types-ethereumjs-util/index.d.ts",
|
||||
"../../node_modules/chai-typescript-typings/index.d.ts",
|
||||
"../../node_modules/ethers-typescript-typings/index.d.ts",
|
||||
"../../node_modules/web3-typescript-typings/index.d.ts"
|
||||
"../../node_modules/types-ethereumjs-util/index.d.ts"
|
||||
]
|
||||
}
|
||||
|
@@ -4,3 +4,4 @@ yarn-error.log
|
||||
/scripts/
|
||||
test/
|
||||
tsconfig.json
|
||||
/lib/src/monorepo_scripts/
|
||||
|
76
packages/dev-utils/CHANGELOG.json
Normal file
76
packages/dev-utils/CHANGELOG.json
Normal file
@@ -0,0 +1,76 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1522658513,
|
||||
"version": "0.3.3",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Reduce npm package size by adding an `.npmignore` file."
|
||||
},
|
||||
{
|
||||
"note": "Move `@0xproject/web3_wrapper` to dependencies from devDependencies."
|
||||
}
|
||||
],
|
||||
"timestamp": 1521298800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.3.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add coverage subprovider if SOLIDITY_COVERAGE env variable is true",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Refactor `BlockchainLifecycle` to work with in-process ganache",
|
||||
"pr": 426
|
||||
},
|
||||
{
|
||||
"note": "Remove `RPC` class and move it's logic to `Web3Wrapper`",
|
||||
"pr": 426
|
||||
}
|
||||
],
|
||||
"timestamp": 1521298800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Remove subproviders",
|
||||
"pr": 392
|
||||
}
|
||||
],
|
||||
"timestamp": 1518706800,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.0.12",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
|
||||
"pr": 389
|
||||
}
|
||||
],
|
||||
"timestamp": 1518102000,
|
||||
"isPublished": true
|
||||
},
|
||||
{
|
||||
"version": "0.0.11",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Updated `types-ethereumjs-util` dev dependency",
|
||||
"pr": 352
|
||||
}
|
||||
],
|
||||
"timestamp": 1517929200,
|
||||
"isPublished": true
|
||||
}
|
||||
]
|
@@ -1,4 +1,13 @@
|
||||
# CHANGELOG
|
||||
<!--
|
||||
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v0.3.3 - _April 2, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.3.1 - _March 18, 2018_
|
||||
|
||||
|
@@ -21,8 +21,8 @@ yarn add @0xproject/dev-utils
|
||||
|
||||
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
|
||||
|
||||
```
|
||||
"include": [
|
||||
"./node_modules/web3-typescript-typings/index.d.ts",
|
||||
]
|
||||
```json
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
|
||||
}
|
||||
```
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/dev-utils",
|
||||
"version": "0.3.0",
|
||||
"version": "0.3.3",
|
||||
"description": "0x dev TS utils",
|
||||
"main": "lib/src/index.js",
|
||||
"types": "lib/src/index.d.ts",
|
||||
@@ -25,12 +25,11 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/monorepo-scripts": "^0.1.13",
|
||||
"@0xproject/tslint-config": "^0.4.11",
|
||||
"@types/lodash": "^4.14.86",
|
||||
"@0xproject/monorepo-scripts": "^0.1.15",
|
||||
"@0xproject/tslint-config": "^0.4.13",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"chai": "^4.0.1",
|
||||
"chai-typescript-typings": "^0.0.5",
|
||||
"copyfiles": "^1.2.0",
|
||||
"mocha": "^4.0.1",
|
||||
"npm-run-all": "^4.1.2",
|
||||
@@ -42,11 +41,12 @@
|
||||
"typescript": "2.7.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/sol-cov": "^0.0.2",
|
||||
"@0xproject/subproviders": "^0.8.0",
|
||||
"@0xproject/types": "^0.4.0",
|
||||
"@0xproject/utils": "^0.4.2",
|
||||
"@0xproject/web3-wrapper": "^0.3.0",
|
||||
"@0xproject/sol-cov": "^0.0.5",
|
||||
"@0xproject/subproviders": "^0.8.3",
|
||||
"@0xproject/types": "^0.4.2",
|
||||
"@0xproject/typescript-typings": "^0.0.2",
|
||||
"@0xproject/utils": "^0.4.4",
|
||||
"@0xproject/web3-wrapper": "^0.4.0",
|
||||
"ethereumjs-util": "^5.1.2",
|
||||
"lodash": "^4.17.4",
|
||||
"request-promise-native": "^1.0.5",
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user