Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16
This commit is contained in:
@@ -15,7 +15,7 @@ lib
|
||||
/packages/contract-wrappers/src/artifacts
|
||||
/packages/order-watcher/src/artifacts
|
||||
/packages/metacoin/artifacts
|
||||
/packages/sra-api/public/
|
||||
/packages/sra-spec/public/
|
||||
/packages/contract-wrappers/test/artifacts
|
||||
/packages/order-watcher/test/artifacts
|
||||
/packages/migrations/artifacts/1.0.0
|
||||
|
||||
@@ -33,7 +33,7 @@ If you're developing on 0x now or are interested in using 0x infrastructure in t
|
||||
| [`@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-api`](/packages/sra-api) | [](https://www.npmjs.com/package/@0xproject/sra-api) | OpenAPI specification for the standard relayer API |
|
||||
| [`@0xproject/sra-spec`](/packages/sra-spec) | [](https://www.npmjs.com/package/@0xproject/sra-spec) | OpenAPI specification for the standard relayer API |
|
||||
| [`@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 |
|
||||
| [`@0xproject/subproviders`](/packages/subproviders) | [](https://www.npmjs.com/package/@0xproject/subproviders) | Useful web3 subproviders (e.g LedgerSubprovider) |
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
"Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher`",
|
||||
"pr": 963
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.3",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.3 - _August 13, 2018_
|
||||
## v1.0.1-rc.4 - _August 24, 2018_
|
||||
|
||||
* Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher` (#963)
|
||||
|
||||
## v1.0.1-rc.3 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
* Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914)
|
||||
@@ -22,11 +26,11 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0-rc.2 - _July 19, 2018_
|
||||
## v1.0.0-rc.2 - _July 20, 2018_
|
||||
|
||||
* Remove `zeroEx.assetData` and instead re-export it's static functions directly off `ZeroEx`
|
||||
|
||||
## v1.0.0-rc.1 - _July 19, 2018_
|
||||
## v1.0.0-rc.1 - _July 20, 2018_
|
||||
|
||||
* Remove tokenRegistry wrapper (#863)
|
||||
* Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
|
||||
@@ -66,7 +70,7 @@ CHANGELOG
|
||||
* Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
|
||||
* Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
|
||||
|
||||
## v0.37.2 - _May 4, 2018_
|
||||
## v0.37.2 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "0x.js",
|
||||
"version": "1.0.1-rc.3",
|
||||
"version": "1.0.1-rc.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -20,7 +20,6 @@
|
||||
"build:all": "run-p build:umd:prod build:commonjs",
|
||||
"lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
|
||||
"test:circleci": "run-s test:coverage",
|
||||
"test": "yarn run_mocha",
|
||||
"rebuild_and_test": "run-s build test",
|
||||
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
|
||||
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
|
||||
@@ -43,11 +42,11 @@
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/migrations": "^1.0.4",
|
||||
"@0xproject/monorepo-scripts": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/migrations": "^1.0.5",
|
||||
"@0xproject/monorepo-scripts": "^1.0.6",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/node": "^8.0.53",
|
||||
@@ -74,17 +73,17 @@
|
||||
"webpack": "^3.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/contract-wrappers": "^1.0.1-rc.3",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.3",
|
||||
"@0xproject/order-watcher": "1.0.1-rc.3",
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/contract-wrappers": "^1.0.1-rc.4",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/order-watcher": "^1.0.1-rc.4",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethers": "3.0.22",
|
||||
"lodash": "^4.17.5",
|
||||
"web3-provider-engine": "14.0.6"
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.6",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.5",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v1.0.6 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -25,7 +29,7 @@ CHANGELOG
|
||||
|
||||
* Fix the abi-gen entry point in package.json (#901)
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Convert e_r_c to erc in generated file names (#822)
|
||||
* Remove the output directory before writing to it (#822)
|
||||
@@ -43,7 +47,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.3.1 - _May 31, 2018_
|
||||
## v0.3.1 - _June 1, 2018_
|
||||
|
||||
* Incorrect publish that was unpublished
|
||||
|
||||
@@ -51,7 +55,7 @@ CHANGELOG
|
||||
|
||||
* Properly export the executable binary (#588)
|
||||
|
||||
## v0.2.13 - _May 4, 2018_
|
||||
## v0.2.13 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/abi-gen",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -31,10 +31,10 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"chalk": "^2.3.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"glob": "^7.1.2",
|
||||
"handlebars": "^4.0.11",
|
||||
"lodash": "^4.17.5",
|
||||
@@ -45,7 +45,7 @@
|
||||
"yargs": "^10.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/glob": "5.0.35",
|
||||
"@types/handlebars": "^4.0.36",
|
||||
"@types/mkdirp": "^0.5.1",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.6",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.5",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v1.0.6 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -25,7 +29,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values (#821)
|
||||
|
||||
@@ -41,7 +45,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.2.11 - _May 31, 2018_
|
||||
## v0.2.11 - _June 1, 2018_
|
||||
|
||||
* Incorrect publish that was unpublished
|
||||
|
||||
@@ -49,7 +53,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.2.9 - _May 4, 2018_
|
||||
## v0.2.9 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/assert",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -29,7 +29,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/valid-url": "^1.0.2",
|
||||
@@ -45,9 +45,9 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"lodash": "^4.17.5",
|
||||
"valid-url": "^1.0.9"
|
||||
},
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "2.0.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2.0.0-rc.1",
|
||||
"changes": [
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v2.0.0-rc.1 - _August 13, 2018_
|
||||
## v2.0.0 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v2.0.0-rc.1 - _August 14, 2018_
|
||||
|
||||
* Added strict encoding/decoding checks for sendTransaction and call (#915)
|
||||
|
||||
@@ -25,7 +29,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -41,7 +45,7 @@ CHANGELOG
|
||||
|
||||
* Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201
|
||||
|
||||
## v0.3.3 - _May 31, 2018_
|
||||
## v0.3.3 - _June 1, 2018_
|
||||
|
||||
* Incorrect publish that was unpublished
|
||||
|
||||
@@ -49,7 +53,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.3.1 - _May 4, 2018_
|
||||
## v0.3.1 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/base-contract",
|
||||
"version": "2.0.0-rc.1",
|
||||
"version": "2.0.0",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -29,7 +29,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"chai": "^4.0.1",
|
||||
"copyfiles": "^2.0.0",
|
||||
@@ -41,10 +41,10 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethers": "3.0.22",
|
||||
"lodash": "^4.17.5"
|
||||
},
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
"note": "Stopped exporting `Order` type",
|
||||
"pr": 924
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
|
||||
@@ -5,7 +5,12 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v2.0.0-rc.1 - _August 24, 2018_
|
||||
|
||||
* Updated for SRA v2 (#974)
|
||||
* Stopped exporting `Order` type (#924)
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -25,7 +30,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`
|
||||
|
||||
@@ -49,7 +54,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.6.12 - _May 4, 2018_
|
||||
## v0.6.12 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/connect",
|
||||
"version": "1.0.5",
|
||||
"version": "2.0.0-rc.1",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,11 +44,11 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"lodash": "^4.17.5",
|
||||
"query-string": "^5.0.1",
|
||||
"sinon": "^4.0.0",
|
||||
@@ -56,7 +56,7 @@
|
||||
"websocket": "^1.0.25"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/fetch-mock": "^6.0.3",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
"note": "Added Transaction Encoder for use with 0x Exchange executeTransaction",
|
||||
"pr": 975
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.3",
|
||||
|
||||
@@ -5,7 +5,13 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.3 - _August 13, 2018_
|
||||
## v1.0.1-rc.4 - _August 24, 2018_
|
||||
|
||||
* Export missing types: `TransactionEncoder`, `ContractAbi`, `JSONRPCRequestPayload`, `JSONRPCResponsePayload`, `JSONRPCErrorCallback`, `AbiDefinition`, `FunctionAbi`, `EventAbi`, `EventParameter`, `DecodedLogArgs`, `MethodAbi`, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability`, `StateMutability` & `ExchangeSignatureValidatorApprovalEventArgs` (#924)
|
||||
* Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`, `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs` (#924)
|
||||
* Added Transaction Encoder for use with 0x Exchange executeTransaction (#975)
|
||||
|
||||
## v1.0.1-rc.3 - _August 14, 2018_
|
||||
|
||||
* Added strict encoding/decoding checks for sendTransaction and call (#915)
|
||||
* Add ForwarderWrapper (#934)
|
||||
@@ -23,7 +29,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0-rc.1 - _July 19, 2018_
|
||||
## v1.0.0-rc.1 - _July 20, 2018_
|
||||
|
||||
* Update blockstream to v5.0 and propogate up caught errors to active subscriptions (#815)
|
||||
* Update to v2 of 0x rpotocol (#822)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/contract-wrappers",
|
||||
"version": "1.0.1-rc.3",
|
||||
"version": "1.0.1-rc.4",
|
||||
"description": "Smart TS wrappers for 0x smart contracts",
|
||||
"keywords": [
|
||||
"0xproject",
|
||||
@@ -44,11 +44,11 @@
|
||||
"node": ">=6.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/migrations": "^1.0.4",
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/migrations": "^1.0.5",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/node": "^8.0.53",
|
||||
@@ -74,16 +74,16 @@
|
||||
"web3-provider-engine": "14.0.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/fill-scenarios": "^1.0.1-rc.3",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.3",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/fill-scenarios": "^1.0.1-rc.4",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethereumjs-blockstream": "5.0.0",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"ethers": "3.0.22",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "contracts",
|
||||
"version": "2.1.40",
|
||||
"version": "2.1.41",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -20,14 +20,11 @@
|
||||
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
|
||||
"test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
|
||||
"test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
|
||||
"run_mocha":
|
||||
"mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
|
||||
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
|
||||
"compile": "sol-compiler --contracts-dir src",
|
||||
"clean": "shx rm -rf lib generated_contract_wrappers",
|
||||
"generate_contract_wrappers":
|
||||
"abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated_contract_wrappers --backend ethers",
|
||||
"lint":
|
||||
"tslint --project . --exclude **/src/generated_contract_wrappers/**/* --exclude **/lib/**/* && yarn lint-contracts",
|
||||
"generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated_contract_wrappers --backend ethers",
|
||||
"lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/* --exclude **/lib/**/* && yarn lint-contracts",
|
||||
"coverage:report:text": "istanbul report text",
|
||||
"coverage:report:html": "istanbul report html && open coverage/index.html",
|
||||
"profiler:report:html": "istanbul report html && open coverage/index.html",
|
||||
@@ -36,8 +33,7 @@
|
||||
"lint-contracts": "solhint src/2.0.0/**/**/**/**/*.sol"
|
||||
},
|
||||
"config": {
|
||||
"abis":
|
||||
"../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|Validator|Wallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"
|
||||
"abis": "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|Validator|Wallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -50,12 +46,12 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/sol-cov": "^2.0.0",
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/sol-compiler": "^1.0.5",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/sol-compiler": "^1.1.0",
|
||||
"@0xproject/sol-cov": "^2.1.0",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/bn.js": "^4.11.0",
|
||||
"@types/ethereumjs-abi": "^0.6.0",
|
||||
"@types/lodash": "4.14.104",
|
||||
@@ -77,15 +73,15 @@
|
||||
"yargs": "^10.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.3",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"@types/js-combinatorics": "^0.5.29",
|
||||
"bn.js": "^4.11.8",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethereumjs-abi": "0.6.5",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"ethers": "3.0.22",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.5",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.4",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.4 - _August 13, 2018_
|
||||
## v1.0.5 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.4 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -21,7 +25,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -47,7 +51,7 @@ CHANGELOG
|
||||
* Pass SolCompilerArtifactAdapter to CoverageSubprovider (#589)
|
||||
* Move callbackErrorReporter over from 0x.js (#579)
|
||||
|
||||
## v0.4.1 - _May 4, 2018_
|
||||
## v0.4.1 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/dev-utils",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -29,7 +29,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"chai": "^4.0.1",
|
||||
@@ -43,12 +43,12 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"lodash": "^4.17.5"
|
||||
},
|
||||
"publishConfig": {
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.5",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.4",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.4 - _August 13, 2018_
|
||||
## v1.0.5 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.4 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -21,11 +25,12 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Add `TraceParams` interface for `debug_traceTransaction` parameters (#675)
|
||||
* Add `TransactionReceiptStatus` type (#812)
|
||||
* Add Artifact types: `CompilerSettings`, `CompilerOptions`, `OutputField` (#924)
|
||||
|
||||
## v0.0.2 - _May 31, 2018_
|
||||
## v0.0.2 - _June 1, 2018_
|
||||
|
||||
* Initial publish (#642)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ethereum-types",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -29,7 +29,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"copyfiles": "^2.0.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
"shx": "^0.2.2",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.1-rc.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.3",
|
||||
"changes": [
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.3 - _August 13, 2018_
|
||||
## v1.0.1-rc.4 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.1-rc.3 - _August 14, 2018_
|
||||
|
||||
* Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface (#936)
|
||||
* Dependencies updated
|
||||
@@ -22,7 +26,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0-rc.1 - _July 19, 2018_
|
||||
## v1.0.0-rc.1 - _July 20, 2018_
|
||||
|
||||
* Make fill-scenarios compatible with V2 of 0x protocol (#656)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/fill-scenarios",
|
||||
"version": "1.0.1-rc.3",
|
||||
"version": "1.0.1-rc.4",
|
||||
"description": "0x order fill scenario generator",
|
||||
"main": "lib/index.js",
|
||||
"types": "lib/index.d.ts",
|
||||
@@ -27,8 +27,8 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"copyfiles": "^2.0.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
@@ -38,13 +38,13 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.3",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethers": "3.0.22",
|
||||
"lodash": "^4.17.5"
|
||||
},
|
||||
|
||||
8
packages/forwarder-helper/.npmignore
Normal file
8
packages/forwarder-helper/.npmignore
Normal file
@@ -0,0 +1,8 @@
|
||||
.*
|
||||
yarn-error.log
|
||||
/src/
|
||||
/scripts/
|
||||
/schemas/
|
||||
test/
|
||||
tsconfig.json
|
||||
/lib/src/monorepo_scripts/
|
||||
12
packages/forwarder-helper/CHANGELOG.json
Normal file
12
packages/forwarder-helper/CHANGELOG.json
Normal file
@@ -0,0 +1,12 @@
|
||||
[
|
||||
{
|
||||
"version": "1.0.1-rc.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Add initial forwarderHelperFactory",
|
||||
"pr": 997
|
||||
}
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
}
|
||||
]
|
||||
@@ -5,6 +5,6 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.4 - _August 13, 2018_
|
||||
## v1.0.1-rc.1 - _August 24, 2018_
|
||||
|
||||
* Add inital spec for SRA v2 (#916)
|
||||
* Add initial forwarderHelperFactory (#997)
|
||||
83
packages/forwarder-helper/README.md
Normal file
83
packages/forwarder-helper/README.md
Normal file
@@ -0,0 +1,83 @@
|
||||
## @0xproject/forwarder-helper
|
||||
|
||||
Provides convenience objects to help work with the Forwarder Contract
|
||||
|
||||
### Read the [Documentation](https://0xproject.com/docs/forwarder-helper).
|
||||
|
||||
## Installation
|
||||
|
||||
```bash
|
||||
yarn add @0xproject/forwarder-helper
|
||||
```
|
||||
|
||||
**Import**
|
||||
|
||||
```typescript
|
||||
import { forwarderHelperFactory } from '@0xproject/forwarder-helper';
|
||||
```
|
||||
|
||||
or
|
||||
|
||||
```javascript
|
||||
var forwarderHelperFactory = require('@0xproject/forwarder-helper').forwarderHelperFactory;
|
||||
```
|
||||
|
||||
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 welcome improvements and fixes from the wider community! 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
|
||||
```
|
||||
|
||||
### Build
|
||||
|
||||
To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
|
||||
|
||||
```bash
|
||||
PKG=@0xproject/forwarder-helper yarn build
|
||||
```
|
||||
|
||||
Or continuously rebuild on change:
|
||||
|
||||
```bash
|
||||
PKG=@0xproject/forwarder-helper yarn watch
|
||||
```
|
||||
|
||||
### Clean
|
||||
|
||||
```bash
|
||||
yarn clean
|
||||
```
|
||||
|
||||
### Lint
|
||||
|
||||
```bash
|
||||
yarn lint
|
||||
```
|
||||
|
||||
### Run Tests
|
||||
|
||||
```bash
|
||||
yarn test
|
||||
```
|
||||
72
packages/forwarder-helper/package.json
Normal file
72
packages/forwarder-helper/package.json
Normal file
@@ -0,0 +1,72 @@
|
||||
{
|
||||
"name": "@0xproject/forwarder-helper",
|
||||
"version": "1.0.1-rc.1",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
"description": "Convenience object for working with the forwarder contract",
|
||||
"main": "lib/src/index.js",
|
||||
"types": "lib/src/index.d.ts",
|
||||
"scripts": {
|
||||
"watch_without_deps": "tsc -w",
|
||||
"lint": "tslint --project .",
|
||||
"test": "yarn run_mocha",
|
||||
"rebuild_and_test": "run-s clean build test",
|
||||
"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",
|
||||
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
|
||||
"clean": "shx rm -rf lib test_temp scripts",
|
||||
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
|
||||
"manual:postpublish": "yarn build; node ./scripts/postpublish.js",
|
||||
"docs:stage": "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": []
|
||||
}
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/0xProject/0x-monorepo.git"
|
||||
},
|
||||
"author": "",
|
||||
"license": "Apache-2.0",
|
||||
"bugs": {
|
||||
"url": "https://github.com/0xProject/0x-monorepo/issues"
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/forwarder-helper/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@types/node": "^8.0.53",
|
||||
"lodash": "^4.17.10"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "^4.14.116",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"chai": "^4.0.1",
|
||||
"chai-as-promised": "^7.1.0",
|
||||
"chai-bignumber": "^2.0.1",
|
||||
"copyfiles": "^1.2.0",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
"mocha": "^4.1.0",
|
||||
"npm-run-all": "^4.1.2",
|
||||
"nyc": "^11.0.1",
|
||||
"shx": "^0.2.2",
|
||||
"tslint": "5.11.0",
|
||||
"typedoc": "0xProject/typedoc",
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
}
|
||||
}
|
||||
5
packages/forwarder-helper/src/constants.ts
Normal file
5
packages/forwarder-helper/src/constants.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
|
||||
export const constants = {
|
||||
ZERO_AMOUNT: new BigNumber(0),
|
||||
};
|
||||
25
packages/forwarder-helper/src/forwarder_helper_factory.ts
Normal file
25
packages/forwarder-helper/src/forwarder_helper_factory.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
import { assert } from '@0xproject/assert';
|
||||
import { schemas } from '@0xproject/json-schemas';
|
||||
import { SignedOrder } from '@0xproject/types';
|
||||
|
||||
import { ForwarderHelperImpl, ForwarderHelperImplConfig } from './forwarder_helper_impl';
|
||||
import { ForwarderHelper } from './types';
|
||||
|
||||
export const forwarderHelperFactory = {
|
||||
/**
|
||||
* Given an array of orders and an array of feeOrders
|
||||
* @param orders An array of objects conforming to SignedOrder. Each order should specify the same makerAssetData and takerAssetData
|
||||
* @param feeOrders An array of objects conforming to SignedOrder. Each order should specify ZRX as makerAssetData WETH as takerAssetData
|
||||
* @return A ForwarderHelper, see type for definition
|
||||
*/
|
||||
getForwarderHelperForOrders(orders: SignedOrder[], feeOrders: SignedOrder[] = []): ForwarderHelper {
|
||||
assert.doesConformToSchema('orders', orders, schemas.signedOrdersSchema);
|
||||
assert.doesConformToSchema('feeOrders', orders, schemas.signedOrdersSchema);
|
||||
const config: ForwarderHelperImplConfig = {
|
||||
orders,
|
||||
feeOrders,
|
||||
};
|
||||
const helper = new ForwarderHelperImpl(config);
|
||||
return helper;
|
||||
},
|
||||
};
|
||||
64
packages/forwarder-helper/src/forwarder_helper_impl.ts
Normal file
64
packages/forwarder-helper/src/forwarder_helper_impl.ts
Normal file
@@ -0,0 +1,64 @@
|
||||
import { marketUtils } from '@0xproject/order-utils';
|
||||
import { SignedOrder } from '@0xproject/types';
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
import { constants } from './constants';
|
||||
import { ForwarderHelper, ForwarderHelperError, MarketBuyOrdersInfo, MarketBuyOrdersInfoRequest } from './types';
|
||||
import { forwarderHelperImplConfigUtils } from './utils/forwarder_helper_impl_config_utils';
|
||||
|
||||
const SLIPPAGE_PERCENTAGE = new BigNumber(0.2); // 20% slippage protection, possibly move this into request interface
|
||||
|
||||
export interface ForwarderHelperImplConfig {
|
||||
orders: SignedOrder[];
|
||||
feeOrders: SignedOrder[];
|
||||
remainingFillableMakerAssetAmounts?: BigNumber[];
|
||||
remainingFillableFeeAmounts?: BigNumber[];
|
||||
}
|
||||
|
||||
export class ForwarderHelperImpl implements ForwarderHelper {
|
||||
public readonly config: ForwarderHelperImplConfig;
|
||||
constructor(config: ForwarderHelperImplConfig) {
|
||||
this.config = forwarderHelperImplConfigUtils.sortedConfig(config);
|
||||
}
|
||||
public getMarketBuyOrdersInfo(request: MarketBuyOrdersInfoRequest): MarketBuyOrdersInfo {
|
||||
const { makerAssetFillAmount, feePercentage } = request;
|
||||
const { orders, feeOrders, remainingFillableMakerAssetAmounts, remainingFillableFeeAmounts } = this.config;
|
||||
// TODO: make the slippage percentage customizable
|
||||
const slippageBufferAmount = makerAssetFillAmount.mul(SLIPPAGE_PERCENTAGE).round();
|
||||
const { resultOrders, remainingFillAmount } = marketUtils.findOrdersThatCoverMakerAssetFillAmount(
|
||||
orders,
|
||||
makerAssetFillAmount,
|
||||
{
|
||||
remainingFillableMakerAssetAmounts,
|
||||
slippageBufferAmount,
|
||||
},
|
||||
);
|
||||
if (remainingFillAmount.gt(constants.ZERO_AMOUNT)) {
|
||||
throw new Error(ForwarderHelperError.InsufficientMakerAssetLiquidity);
|
||||
}
|
||||
// TODO: update this logic to find the minimum amount of feeOrders to cover the worst case as opposed to
|
||||
// finding order that cover all fees, this will help with estimating ETH and minimizing gas usage
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
resultOrders,
|
||||
feeOrders,
|
||||
{
|
||||
remainingFillableMakerAssetAmounts,
|
||||
remainingFillableFeeAmounts,
|
||||
},
|
||||
);
|
||||
if (remainingFeeAmount.gt(constants.ZERO_AMOUNT)) {
|
||||
throw new Error(ForwarderHelperError.InsufficientZrxLiquidity);
|
||||
}
|
||||
// TODO: calculate min and max eth usage
|
||||
// TODO: optimize orders call data
|
||||
return {
|
||||
makerAssetFillAmount,
|
||||
orders: resultOrders,
|
||||
feeOrders: resultFeeOrders,
|
||||
minEthAmount: constants.ZERO_AMOUNT,
|
||||
maxEthAmount: constants.ZERO_AMOUNT,
|
||||
feePercentage,
|
||||
};
|
||||
}
|
||||
}
|
||||
6
packages/forwarder-helper/src/globals.d.ts
vendored
Normal file
6
packages/forwarder-helper/src/globals.d.ts
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
declare module '*.json' {
|
||||
const json: any;
|
||||
/* tslint:disable */
|
||||
export default json;
|
||||
/* tslint:enable */
|
||||
}
|
||||
2
packages/forwarder-helper/src/index.ts
Normal file
2
packages/forwarder-helper/src/index.ts
Normal file
@@ -0,0 +1,2 @@
|
||||
export { forwarderHelperFactory } from './forwarder_helper_factory';
|
||||
export { ForwarderHelper, ForwarderHelperError, MarketBuyOrdersInfoRequest, MarketBuyOrdersInfo } from './types';
|
||||
43
packages/forwarder-helper/src/types.ts
Normal file
43
packages/forwarder-helper/src/types.ts
Normal file
@@ -0,0 +1,43 @@
|
||||
import { SignedOrder } from '@0xproject/types';
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
|
||||
export interface ForwarderHelper {
|
||||
/**
|
||||
* Given a MarketBuyOrdersInfoRequest, returns a MarketBuyOrdersInfo containing all information relevant to fulfilling the request
|
||||
* using the ForwarderContract marketBuyOrdersWithEth function.
|
||||
* @param request An object that conforms to MarketBuyOrdersInfoRequest. See type definition for more information.
|
||||
* @return An object that conforms to MarketBuyOrdersInfo that satisfies the request. See type definition for more information.
|
||||
*/
|
||||
getMarketBuyOrdersInfo: (request: MarketBuyOrdersInfoRequest) => MarketBuyOrdersInfo;
|
||||
}
|
||||
|
||||
export enum ForwarderHelperError {
|
||||
InsufficientMakerAssetLiquidity = 'INSUFFICIENT_MAKER_ASSET_LIQUIDITY',
|
||||
InsufficientZrxLiquidity = 'INSUFFICIENT_ZRX_LIQUIDITY',
|
||||
}
|
||||
|
||||
/**
|
||||
* makerAssetFillAmount: The amount of makerAsset requesting to be filled
|
||||
* feePercentage: Optional affiliate percentage amount factoring into eth amount calculations
|
||||
*/
|
||||
export interface MarketBuyOrdersInfoRequest {
|
||||
makerAssetFillAmount: BigNumber;
|
||||
feePercentage?: BigNumber;
|
||||
}
|
||||
|
||||
/**
|
||||
* makerAssetFillAmount: The amount of makerAsset requesting to be filled
|
||||
* orders: An array of objects conforming to SignedOrder. These orders can be used to cover the requested makerAssetFillAmount plus slippage
|
||||
* feeOrders: An array of objects conforming to SignedOrder. These orders can be used to cover the fees for the orders param above
|
||||
* minEthAmount: Amount of eth in wei to send with the tx for the most optimistic case
|
||||
* maxEthAmount: Amount of eth in wei to send with the tx for the worst case
|
||||
* feePercentage: Affiliate fee percentage used to calculate the eth amounts above. Passed thru directly from the request
|
||||
*/
|
||||
export interface MarketBuyOrdersInfo {
|
||||
makerAssetFillAmount: BigNumber;
|
||||
orders: SignedOrder[];
|
||||
feeOrders: SignedOrder[];
|
||||
minEthAmount: BigNumber;
|
||||
maxEthAmount: BigNumber;
|
||||
feePercentage?: BigNumber;
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
import { sortingUtils } from '@0xproject/order-utils';
|
||||
import { SignedOrder } from '@0xproject/types';
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
import { ForwarderHelperImplConfig } from '../forwarder_helper_impl';
|
||||
|
||||
interface SignedOrderWithAmount extends SignedOrder {
|
||||
remainingFillAmount: BigNumber;
|
||||
}
|
||||
|
||||
export const forwarderHelperImplConfigUtils = {
|
||||
sortedConfig(config: ForwarderHelperImplConfig): ForwarderHelperImplConfig {
|
||||
const { orders, feeOrders, remainingFillableMakerAssetAmounts, remainingFillableFeeAmounts } = config;
|
||||
// TODO: provide a feeRate to the sorting function to more accurately sort based on the current market for ZRX tokens
|
||||
const orderSorter = (ordersToSort: SignedOrder[]) => {
|
||||
return sortingUtils.sortOrdersByFeeAdjustedRate(ordersToSort);
|
||||
};
|
||||
const sortOrdersResult = sortOrdersAndRemainingFillAmounts(
|
||||
orderSorter,
|
||||
orders,
|
||||
remainingFillableMakerAssetAmounts,
|
||||
);
|
||||
const feeOrderSorter = (ordersToSort: SignedOrder[]) => {
|
||||
return sortingUtils.sortFeeOrdersByFeeAdjustedRate(ordersToSort);
|
||||
};
|
||||
const sortFeeOrdersResult = sortOrdersAndRemainingFillAmounts(
|
||||
feeOrderSorter,
|
||||
feeOrders,
|
||||
remainingFillableFeeAmounts,
|
||||
);
|
||||
return {
|
||||
orders: sortOrdersResult.orders,
|
||||
feeOrders: sortFeeOrdersResult.orders,
|
||||
remainingFillableMakerAssetAmounts: sortOrdersResult.remainingFillAmounts,
|
||||
remainingFillableFeeAmounts: sortFeeOrdersResult.remainingFillAmounts,
|
||||
};
|
||||
},
|
||||
};
|
||||
|
||||
type OrderSorter = (orders: SignedOrder[]) => SignedOrder[];
|
||||
|
||||
function sortOrdersAndRemainingFillAmounts(
|
||||
orderSorter: OrderSorter,
|
||||
orders: SignedOrder[],
|
||||
remainingFillAmounts?: BigNumber[],
|
||||
): { orders: SignedOrder[]; remainingFillAmounts?: BigNumber[] } {
|
||||
if (!_.isUndefined(remainingFillAmounts)) {
|
||||
// Bundle orders together with their remainingFillAmounts so that we can sort them together
|
||||
const orderWithAmounts = bundleSignedOrderWithAmounts(orders, remainingFillAmounts);
|
||||
// Sort
|
||||
const sortedOrderWithAmounts = orderSorter(orderWithAmounts) as SignedOrderWithAmount[];
|
||||
// Unbundle after sorting
|
||||
const unbundledSortedOrderWithAmounts = unbundleSignedOrderWithAmounts(sortedOrderWithAmounts);
|
||||
return {
|
||||
orders: unbundledSortedOrderWithAmounts.orders,
|
||||
remainingFillAmounts: unbundledSortedOrderWithAmounts.amounts,
|
||||
};
|
||||
} else {
|
||||
const sortedOrders = orderSorter(orders);
|
||||
return {
|
||||
orders: sortedOrders,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function bundleSignedOrderWithAmounts(orders: SignedOrder[], amounts: BigNumber[]): SignedOrderWithAmount[] {
|
||||
const ordersAndAmounts = _.map(orders, (order, index) => {
|
||||
return {
|
||||
...order,
|
||||
remainingFillAmount: amounts[index],
|
||||
};
|
||||
});
|
||||
return ordersAndAmounts;
|
||||
}
|
||||
|
||||
function unbundleSignedOrderWithAmounts(
|
||||
signedOrderWithAmounts: SignedOrderWithAmount[],
|
||||
): { orders: SignedOrder[]; amounts: BigNumber[] } {
|
||||
const orders = _.map(signedOrderWithAmounts, order => {
|
||||
const { remainingFillAmount, ...rest } = order;
|
||||
return rest;
|
||||
});
|
||||
const amounts = _.map(signedOrderWithAmounts, order => {
|
||||
const { remainingFillAmount } = order;
|
||||
return remainingFillAmount;
|
||||
});
|
||||
return {
|
||||
orders,
|
||||
amounts,
|
||||
};
|
||||
}
|
||||
136
packages/forwarder-helper/test/forwarder_helper_impl_test.ts
Normal file
136
packages/forwarder-helper/test/forwarder_helper_impl_test.ts
Normal file
@@ -0,0 +1,136 @@
|
||||
import { testOrderFactory } from '@0xproject/order-utils/lib/test/utils/test_order_factory';
|
||||
import { BigNumber } from '@0xproject/utils';
|
||||
import * as chai from 'chai';
|
||||
import * as _ from 'lodash';
|
||||
import 'mocha';
|
||||
|
||||
import { ForwarderHelperImpl, ForwarderHelperImplConfig } from '../src/forwarder_helper_impl';
|
||||
import { ForwarderHelperError } from '../src/types';
|
||||
|
||||
import { chaiSetup } from './utils/chai_setup';
|
||||
|
||||
chaiSetup.configure();
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('ForwarderHelperImpl', () => {
|
||||
// rate: 2 takerAsset / makerAsset
|
||||
const testOrder1 = testOrderFactory.generateTestSignedOrder({
|
||||
makerAssetAmount: new BigNumber(100),
|
||||
takerAssetAmount: new BigNumber(200),
|
||||
});
|
||||
// rate: 1 takerAsset / makerAsset
|
||||
const testOrder2 = testOrderFactory.generateTestSignedOrder({
|
||||
makerAssetAmount: new BigNumber(100),
|
||||
takerAssetAmount: new BigNumber(100),
|
||||
});
|
||||
// rate: 3 takerAsset / makerAsset
|
||||
const testOrder3 = testOrderFactory.generateTestSignedOrder({
|
||||
makerAssetAmount: new BigNumber(100),
|
||||
takerAssetAmount: new BigNumber(300),
|
||||
takerFee: new BigNumber(1),
|
||||
});
|
||||
// rate: 3 WETH / ZRX
|
||||
const testFeeOrder1 = testOrderFactory.generateTestSignedOrder({
|
||||
makerAssetAmount: new BigNumber(100),
|
||||
takerAssetAmount: new BigNumber(300),
|
||||
});
|
||||
// rate: 2 WETH / ZRX
|
||||
const testFeeOrder2 = testOrderFactory.generateTestSignedOrder({
|
||||
makerAssetAmount: new BigNumber(100),
|
||||
takerAssetAmount: new BigNumber(200),
|
||||
});
|
||||
// rate: 1 WETH / ZRX
|
||||
const testFeeOrder3 = testOrderFactory.generateTestSignedOrder({
|
||||
makerAssetAmount: new BigNumber(100),
|
||||
takerAssetAmount: new BigNumber(100),
|
||||
});
|
||||
const inputForwarderHelperConfig: ForwarderHelperImplConfig = {
|
||||
orders: [testOrder1, testOrder2, testOrder3],
|
||||
feeOrders: [testFeeOrder1, testFeeOrder2, testFeeOrder3],
|
||||
remainingFillableMakerAssetAmounts: [new BigNumber(1), new BigNumber(2), new BigNumber(3)],
|
||||
remainingFillableFeeAmounts: [new BigNumber(4), new BigNumber(5), new BigNumber(6)],
|
||||
};
|
||||
describe('#constructor', () => {
|
||||
const inputForwarderHelperConfigNoRemainingAmounts: ForwarderHelperImplConfig = {
|
||||
orders: [testOrder1, testOrder2, testOrder3],
|
||||
feeOrders: [testFeeOrder1, testFeeOrder2, testFeeOrder3],
|
||||
};
|
||||
it('sorts orders', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
expect(forwarderHelper.config.orders).deep.equals([testOrder2, testOrder1, testOrder3]);
|
||||
});
|
||||
it('sorts fee orders', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
expect(forwarderHelper.config.feeOrders).deep.equals([testFeeOrder3, testFeeOrder2, testFeeOrder1]);
|
||||
});
|
||||
it('sorts remainingFillableMakerAssetAmounts', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
expect(forwarderHelper.config.remainingFillableMakerAssetAmounts).to.be.not.undefined();
|
||||
expect(_.nth(forwarderHelper.config.remainingFillableMakerAssetAmounts, 0)).to.bignumber.equal(
|
||||
new BigNumber(2),
|
||||
);
|
||||
expect(_.nth(forwarderHelper.config.remainingFillableMakerAssetAmounts, 1)).to.bignumber.equal(
|
||||
new BigNumber(1),
|
||||
);
|
||||
expect(_.nth(forwarderHelper.config.remainingFillableMakerAssetAmounts, 2)).to.bignumber.equal(
|
||||
new BigNumber(3),
|
||||
);
|
||||
});
|
||||
it('sorts remainingFillableFeeAmounts', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
expect(forwarderHelper.config.remainingFillableFeeAmounts).to.be.not.undefined();
|
||||
expect(_.nth(forwarderHelper.config.remainingFillableFeeAmounts, 0)).to.bignumber.equal(new BigNumber(6));
|
||||
expect(_.nth(forwarderHelper.config.remainingFillableFeeAmounts, 1)).to.bignumber.equal(new BigNumber(5));
|
||||
expect(_.nth(forwarderHelper.config.remainingFillableFeeAmounts, 2)).to.bignumber.equal(new BigNumber(4));
|
||||
});
|
||||
it('remainingFillableMakerAssetAmounts is undefined if none provided', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfigNoRemainingAmounts);
|
||||
expect(forwarderHelper.config.remainingFillableMakerAssetAmounts).to.be.undefined();
|
||||
});
|
||||
it('remainingFillableFeeAmounts is undefined if none provided', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfigNoRemainingAmounts);
|
||||
expect(forwarderHelper.config.remainingFillableFeeAmounts).to.be.undefined();
|
||||
});
|
||||
});
|
||||
describe('#getMarketBuyOrdersInfo', () => {
|
||||
it('throws if not enough makerAsset liquidity', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
expect(() => {
|
||||
// request for 6 makerAsset units, because we have exactly 6 available we should throw because there is a built in slippage buffer
|
||||
forwarderHelper.getMarketBuyOrdersInfo({
|
||||
makerAssetFillAmount: new BigNumber(6),
|
||||
});
|
||||
}).to.throw(ForwarderHelperError.InsufficientMakerAssetLiquidity);
|
||||
});
|
||||
it('throws if not enough ZRX liquidity', () => {
|
||||
const inputForwarderHelperConfigNoFees: ForwarderHelperImplConfig = {
|
||||
orders: [testOrder1, testOrder2, testOrder3],
|
||||
feeOrders: [],
|
||||
};
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfigNoFees);
|
||||
expect(() => {
|
||||
// request for 4 makerAsset units, we need fees but no fee orders exist, show we should throw
|
||||
forwarderHelper.getMarketBuyOrdersInfo({
|
||||
makerAssetFillAmount: new BigNumber(250),
|
||||
});
|
||||
}).to.throw(ForwarderHelperError.InsufficientZrxLiquidity);
|
||||
});
|
||||
it('passes the makerAssetFillAmount from the request to the info response', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
const makerAssetFillAmount = new BigNumber(4);
|
||||
const info = forwarderHelper.getMarketBuyOrdersInfo({
|
||||
makerAssetFillAmount,
|
||||
});
|
||||
expect(info.makerAssetFillAmount).to.bignumber.equal(makerAssetFillAmount);
|
||||
});
|
||||
it('passes the feePercentage from the request to the info response', () => {
|
||||
const forwarderHelper = new ForwarderHelperImpl(inputForwarderHelperConfig);
|
||||
const feePercentage = new BigNumber(0.2);
|
||||
const info = forwarderHelper.getMarketBuyOrdersInfo({
|
||||
makerAssetFillAmount: new BigNumber(4),
|
||||
feePercentage,
|
||||
});
|
||||
expect(info.feePercentage).to.bignumber.equal(feePercentage);
|
||||
});
|
||||
});
|
||||
});
|
||||
13
packages/forwarder-helper/test/utils/chai_setup.ts
Normal file
13
packages/forwarder-helper/test/utils/chai_setup.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import * as chai from 'chai';
|
||||
import chaiAsPromised = require('chai-as-promised');
|
||||
import ChaiBigNumber = require('chai-bignumber');
|
||||
import * as dirtyChai from 'dirty-chai';
|
||||
|
||||
export const chaiSetup = {
|
||||
configure(): void {
|
||||
chai.config.includeStack = true;
|
||||
chai.use(ChaiBigNumber());
|
||||
chai.use(dirtyChai);
|
||||
chai.use(chaiAsPromised);
|
||||
},
|
||||
};
|
||||
7
packages/forwarder-helper/tsconfig.json
Normal file
7
packages/forwarder-helper/tsconfig.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"extends": "../../tsconfig",
|
||||
"compilerOptions": {
|
||||
"outDir": "lib"
|
||||
},
|
||||
"include": ["./src/**/*", "./test/**/*"]
|
||||
}
|
||||
@@ -6,7 +6,8 @@
|
||||
"note": "Update incorrect relayer api fee recipients response schema",
|
||||
"pr": 974
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.4",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.4 - _August 13, 2018_
|
||||
## v1.0.1-rc.5 - _August 24, 2018_
|
||||
|
||||
* Update incorrect relayer api fee recipients response schema (#974)
|
||||
|
||||
## v1.0.1-rc.4 - _August 14, 2018_
|
||||
|
||||
* Allow for additional properties in txData schema (#938)
|
||||
* Change hexSchema to match `0x` (#937)
|
||||
@@ -27,7 +31,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0-rc.1 - _July 19, 2018_
|
||||
## v1.0.0-rc.1 - _July 20, 2018_
|
||||
|
||||
* Update schemas for V2 or 0x Protocol (#615)
|
||||
* Added CallData schema (#821)
|
||||
@@ -53,7 +57,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.7.23 - _May 4, 2018_
|
||||
## v0.7.23 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/json-schemas",
|
||||
"version": "1.0.1-rc.4",
|
||||
"version": "1.0.1-rc.5",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -23,7 +23,9 @@
|
||||
"config": {
|
||||
"postpublish": {
|
||||
"assets": [],
|
||||
"docOmitExports": ["schemas"]
|
||||
"docOmitExports": [
|
||||
"schemas"
|
||||
]
|
||||
}
|
||||
},
|
||||
"repository": {
|
||||
@@ -37,14 +39,14 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@types/node": "^8.0.53",
|
||||
"jsonschema": "^1.2.0",
|
||||
"lodash.values": "^4.3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@types/lodash.foreach": "^4.5.3",
|
||||
"@types/lodash.values": "^4.3.3",
|
||||
"@types/mocha": "^2.2.42",
|
||||
|
||||
@@ -6,7 +6,6 @@ export const relayerApiFeeRecipientsResponseSchema = {
|
||||
{
|
||||
properties: {
|
||||
records: {
|
||||
id: '/relayerApiFeeRecipientsSchema',
|
||||
type: 'array',
|
||||
items: { $ref: '/addressSchema' },
|
||||
},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/metacoin",
|
||||
"version": "0.0.15",
|
||||
"version": "0.0.16",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -29,25 +29,25 @@
|
||||
"author": "",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/sol-cov": "^2.0.0",
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/sol-cov": "^2.1.0",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"@types/mocha": "^5.2.2",
|
||||
"copyfiles": "^2.0.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethers": "3.0.22",
|
||||
"lodash": "^4.17.5",
|
||||
"run-s": "^0.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/sol-compiler": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/sol-compiler": "^1.1.0",
|
||||
"chai": "^4.0.1",
|
||||
"chai-as-promised": "^7.1.0",
|
||||
"chai-bignumber": "^2.0.1",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.5",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.4",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.4 - _August 13, 2018_
|
||||
## v1.0.5 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.4 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -21,7 +25,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Added migrations for 0x Protocol v2
|
||||
|
||||
@@ -45,7 +49,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.5 - _May 4, 2018_
|
||||
## v0.0.5 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/migrations",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -35,10 +35,10 @@
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@types/yargs": "^10.0.0",
|
||||
"copyfiles": "^2.0.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
@@ -49,15 +49,15 @@
|
||||
"yargs": "^10.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.3",
|
||||
"@0xproject/sol-compiler": "^1.0.5",
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/sol-compiler": "^1.1.0",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"@ledgerhq/hw-app-eth": "^4.3.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethers": "3.0.22",
|
||||
"lodash": "^4.17.5"
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "@0xproject/monorepo-scripts",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
|
||||
@@ -18,7 +18,6 @@ import { DocGenerateAndUploadUtils } from './utils/doc_generate_and_upload_utils
|
||||
import { publishReleaseNotesAsync } from './utils/github_release_utils';
|
||||
import { utils } from './utils/utils';
|
||||
|
||||
const DOC_GEN_COMMAND = 'docs:json';
|
||||
const NPM_NAMESPACE = '@0xproject/';
|
||||
const TODAYS_TIMESTAMP = moment().unix();
|
||||
|
||||
@@ -88,7 +87,7 @@ async function confirmAsync(message: string): Promise<void> {
|
||||
function getPackagesWithDocs(allUpdatedPackages: Package[]): Package[] {
|
||||
const rootPackageJsonPath = `${constants.monorepoRootPath}/package.json`;
|
||||
const rootPackageJson = JSON.parse(fs.readFileSync(rootPackageJsonPath).toString());
|
||||
const packagesWithDocPagesStringIfExist = _.get(rootPackageJson, 'configs.packagesWithDocPages', undefined);
|
||||
const packagesWithDocPagesStringIfExist = _.get(rootPackageJson, 'config.packagesWithDocPages', undefined);
|
||||
if (_.isUndefined(packagesWithDocPagesStringIfExist)) {
|
||||
return []; // None to generate & publish
|
||||
}
|
||||
|
||||
@@ -24,8 +24,23 @@
|
||||
"note":
|
||||
"Export types: `SignedOrder`, `Order`, `OrderRelevantState`, `OrderState`, `ECSignature`, `ERC20AssetData`, `ERC721AssetData`, `AssetProxyId`, `SignerType`, `SignatureType`, `OrderStateValid`, `OrderStateInvalid`, `ExchangeContractErrs`, `TradeSide`, `TransferType`, `FindFeeOrdersThatCoverFeesForTargetOrdersOpts`, `FindOrdersThatCoverMakerAssetFillAmountOpts`, `FeeOrdersAndRemainingFeeAmount`, `OrdersAndRemainingFillAmount`, `Provider`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
|
||||
"pr": 924
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Rename `resultOrders` to `resultFeeOrders` for object returned by `findFeeOrdersThatCoverFeesForTargetOrders` in `marketUtils` api",
|
||||
"pr": 997
|
||||
},
|
||||
{
|
||||
"note": "Make `sortFeeOrdersByFeeAdjustedRate` in `sortingUtils` generic",
|
||||
"pr": 997
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Update `findFeeOrdersThatCoverFeesForTargetOrders` to round the the nearest integer when calculating required fees",
|
||||
"pr": 997
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.3",
|
||||
|
||||
@@ -5,7 +5,18 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.3 - _August 13, 2018_
|
||||
## v1.0.1-rc.4 - _August 24, 2018_
|
||||
|
||||
* Remove rounding error being thrown when maker amount is very small (#959)
|
||||
* Added rateUtils and sortingUtils (#953)
|
||||
* Update marketUtils api such that all optional parameters are bundled into one optional param and more defaults are provided (#954)
|
||||
* Instead of exporting signature util methods individually, they are now exported as `signatureUtils` (#924)
|
||||
* Export types: `SignedOrder`, `Order`, `OrderRelevantState`, `OrderState`, `ECSignature`, `ERC20AssetData`, `ERC721AssetData`, `AssetProxyId`, `SignerType`, `SignatureType`, `OrderStateValid`, `OrderStateInvalid`, `ExchangeContractErrs`, `TradeSide`, `TransferType`, `FindFeeOrdersThatCoverFeesForTargetOrdersOpts`, `FindOrdersThatCoverMakerAssetFillAmountOpts`, `FeeOrdersAndRemainingFeeAmount`, `OrdersAndRemainingFillAmount`, `Provider`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload` (#924)
|
||||
* Rename `resultOrders` to `resultFeeOrders` for object returned by `findFeeOrdersThatCoverFeesForTargetOrders` in `marketUtils` api (#997)
|
||||
* Make `sortFeeOrdersByFeeAdjustedRate` in `sortingUtils` generic (#997)
|
||||
* Update `findFeeOrdersThatCoverFeesForTargetOrders` to round the the nearest integer when calculating required fees (#997)
|
||||
|
||||
## v1.0.1-rc.3 - _August 14, 2018_
|
||||
|
||||
* Update ecSignOrderHashAsync to return signature string with signature type byte. Removes messagePrefixOpts. (#914)
|
||||
* Added a synchronous `createOrder` method in `orderFactory`, updated public interfaces to support some optional parameters (#936)
|
||||
@@ -28,7 +39,7 @@ CHANGELOG
|
||||
|
||||
* Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`
|
||||
|
||||
## v1.0.0-rc.1 - _July 19, 2018_
|
||||
## v1.0.0-rc.1 - _July 20, 2018_
|
||||
|
||||
* Refactor to work with V2 of 0x protocol (#636)
|
||||
* Export parseECSignature method (#684)
|
||||
@@ -54,7 +65,7 @@ CHANGELOG
|
||||
|
||||
* Add orderStateUtils, a module for computing order state needed to decide if an order is still valid
|
||||
|
||||
## v0.0.4 - _May 4, 2018_
|
||||
## v0.0.4 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/order-utils",
|
||||
"version": "1.0.1-rc.3",
|
||||
"version": "1.0.1-rc.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -40,8 +40,8 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/bn.js": "^4.11.0",
|
||||
"@types/lodash": "4.14.104",
|
||||
"chai": "^4.0.1",
|
||||
@@ -59,16 +59,16 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"@types/node": "^8.0.53",
|
||||
"bn.js": "^4.11.8",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethereumjs-abi": "0.6.5",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"ethers": "3.0.22",
|
||||
|
||||
@@ -128,7 +128,7 @@ export const marketUtils = {
|
||||
const makerAssetAmountAvailable = remainingFillableMakerAssetAmounts[index];
|
||||
const feeToFillMakerAssetAmountAvailable = makerAssetAmountAvailable
|
||||
.mul(order.takerFee)
|
||||
.div(order.makerAssetAmount);
|
||||
.dividedToIntegerBy(order.makerAssetAmount);
|
||||
return accFees.plus(feeToFillMakerAssetAmountAvailable);
|
||||
},
|
||||
constants.ZERO_AMOUNT,
|
||||
@@ -142,7 +142,7 @@ export const marketUtils = {
|
||||
},
|
||||
);
|
||||
return {
|
||||
resultOrders,
|
||||
resultFeeOrders: resultOrders,
|
||||
remainingFeeAmount: remainingFillAmount,
|
||||
};
|
||||
// TODO: add more orders here to cover rounding
|
||||
|
||||
@@ -32,7 +32,7 @@ export const sortingUtils = {
|
||||
* the makerAsset and WETH as the takerAsset.
|
||||
* @return The input orders sorted by rate in ascending order
|
||||
*/
|
||||
sortFeeOrdersByFeeAdjustedRate(feeOrders: Order[]): Order[] {
|
||||
sortFeeOrdersByFeeAdjustedRate<T extends Order>(feeOrders: T[]): T[] {
|
||||
assert.doesConformToSchema('feeOrders', feeOrders, schemas.ordersSchema);
|
||||
const rateCalculator = rateUtils.getFeeAdjustedRateOfFeeOrder.bind(rateUtils);
|
||||
const sortedOrders = sortOrders(feeOrders, rateCalculator);
|
||||
|
||||
@@ -71,7 +71,7 @@ export interface FindFeeOrdersThatCoverFeesForTargetOrdersOpts {
|
||||
}
|
||||
|
||||
export interface FeeOrdersAndRemainingFeeAmount<T> {
|
||||
resultOrders: T[];
|
||||
resultFeeOrders: T[];
|
||||
remainingFeeAmount: BigNumber;
|
||||
}
|
||||
|
||||
|
||||
@@ -140,11 +140,11 @@ describe('marketUtils', () => {
|
||||
);
|
||||
describe('no target orders', () => {
|
||||
it('returns empty and zero remainingFeeAmount', async () => {
|
||||
const { resultOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
[],
|
||||
inputFeeOrders,
|
||||
);
|
||||
expect(resultOrders).to.be.empty;
|
||||
expect(resultFeeOrders).to.be.empty;
|
||||
expect(remainingFeeAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
|
||||
});
|
||||
});
|
||||
@@ -163,14 +163,14 @@ describe('marketUtils', () => {
|
||||
// generate remainingFillableMakerAssetAmounts that equal the makerAssetAmount
|
||||
const remainingFillableMakerAssetAmounts = [makerAssetAmount, makerAssetAmount, makerAssetAmount];
|
||||
it('returns empty and non-zero remainingFeeAmount', async () => {
|
||||
const { resultOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
inputOrders,
|
||||
[],
|
||||
{
|
||||
remainingFillableMakerAssetAmounts,
|
||||
},
|
||||
);
|
||||
expect(resultOrders).to.be.empty;
|
||||
expect(resultFeeOrders).to.be.empty;
|
||||
expect(remainingFeeAmount).to.be.bignumber.equal(new BigNumber(30));
|
||||
});
|
||||
});
|
||||
@@ -184,11 +184,11 @@ describe('marketUtils', () => {
|
||||
3,
|
||||
);
|
||||
it('returns empty and zero remainingFeeAmount', async () => {
|
||||
const { resultOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
inputOrders,
|
||||
inputFeeOrders,
|
||||
);
|
||||
expect(resultOrders).to.be.empty;
|
||||
expect(resultFeeOrders).to.be.empty;
|
||||
expect(remainingFeeAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
|
||||
});
|
||||
});
|
||||
@@ -205,11 +205,11 @@ describe('marketUtils', () => {
|
||||
3,
|
||||
);
|
||||
it('returns input fee orders and zero remainingFeeAmount', async () => {
|
||||
const { resultOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
inputOrders,
|
||||
inputFeeOrders,
|
||||
);
|
||||
expect(resultOrders).to.be.deep.equal(inputFeeOrders);
|
||||
expect(resultFeeOrders).to.be.deep.equal(inputFeeOrders);
|
||||
expect(remainingFeeAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
|
||||
});
|
||||
});
|
||||
@@ -231,14 +231,14 @@ describe('marketUtils', () => {
|
||||
// 3. order is completely fillable
|
||||
const remainingFillableMakerAssetAmounts = [constants.ZERO_AMOUNT, new BigNumber(5), makerAssetAmount];
|
||||
it('returns first two input fee orders and zero remainingFeeAmount', async () => {
|
||||
const { resultOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
inputOrders,
|
||||
inputFeeOrders,
|
||||
{
|
||||
remainingFillableMakerAssetAmounts,
|
||||
},
|
||||
);
|
||||
expect(resultOrders).to.be.deep.equal([inputFeeOrders[0], inputFeeOrders[1]]);
|
||||
expect(resultFeeOrders).to.be.deep.equal([inputFeeOrders[0], inputFeeOrders[1]]);
|
||||
expect(remainingFeeAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
|
||||
});
|
||||
});
|
||||
@@ -255,11 +255,11 @@ describe('marketUtils', () => {
|
||||
3,
|
||||
);
|
||||
it('returns input fee orders and non-zero remainingFeeAmount', async () => {
|
||||
const { resultOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
const { resultFeeOrders, remainingFeeAmount } = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(
|
||||
inputOrders,
|
||||
inputFeeOrders,
|
||||
);
|
||||
expect(resultOrders).to.be.deep.equal(inputFeeOrders);
|
||||
expect(resultFeeOrders).to.be.deep.equal(inputFeeOrders);
|
||||
expect(remainingFeeAmount).to.be.bignumber.equal(new BigNumber(30));
|
||||
});
|
||||
});
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
"note": "Remove exporting types: `BlockParamLiteral`, `BlockParam`, `Order`",
|
||||
"pr": 924
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.3",
|
||||
|
||||
@@ -5,7 +5,12 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.3 - _August 13, 2018_
|
||||
## v1.0.1-rc.4 - _August 24, 2018_
|
||||
|
||||
* Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload` (#924)
|
||||
* Remove exporting types: `BlockParamLiteral`, `BlockParam`, `Order` (#924)
|
||||
|
||||
## v1.0.1-rc.3 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -21,7 +26,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0-rc.1 - _July 19, 2018_
|
||||
## v1.0.0-rc.1 - _July 20, 2018_
|
||||
|
||||
* Add support for ERC721 event watching and Exchange V2 events (#887)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/order-watcher",
|
||||
"version": "1.0.1-rc.3",
|
||||
"version": "1.0.1-rc.4",
|
||||
"description": "An order watcher daemon that watches for order validity",
|
||||
"keywords": [
|
||||
"0x",
|
||||
@@ -43,10 +43,10 @@
|
||||
"node": ">=6.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/abi-gen": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/migrations": "^1.0.4",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/abi-gen": "^1.0.6",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/migrations": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/bintrees": "^1.0.2",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.42",
|
||||
@@ -71,18 +71,18 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/base-contract": "^2.0.0-rc.1",
|
||||
"@0xproject/contract-wrappers": "^1.0.1-rc.3",
|
||||
"@0xproject/fill-scenarios": "^1.0.1-rc.3",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.3",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/base-contract": "^2.0.0",
|
||||
"@0xproject/contract-wrappers": "^1.0.1-rc.4",
|
||||
"@0xproject/fill-scenarios": "^1.0.1-rc.4",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/order-utils": "^1.0.1-rc.4",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"bintrees": "^1.0.2",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethereumjs-blockstream": "5.0.0",
|
||||
"ethers": "3.0.22",
|
||||
"lodash": "^4.17.5"
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.6",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.5",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v1.0.6 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -25,7 +29,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -45,7 +49,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.13 - _May 31, 2018_
|
||||
## v0.0.13 - _June 1, 2018_
|
||||
|
||||
* Incorrect publish that was unpublished
|
||||
|
||||
@@ -53,7 +57,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.11 - _May 4, 2018_
|
||||
## v0.0.11 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/react-docs",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -24,8 +24,8 @@
|
||||
"url": "https://github.com/0xProject/0x-monorepo.git"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/compare-versions": "^3.0.0",
|
||||
"copyfiles": "^2.0.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
@@ -34,8 +34,8 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/react-shared": "^1.0.6",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/react-shared": "^1.0.7",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/material-ui": "0.18.0",
|
||||
"@types/node": "^8.0.53",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.7",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.6",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.6 - _August 13, 2018_
|
||||
## v1.0.7 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.6 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -29,7 +33,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -45,11 +49,11 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.2.0 - _May 4, 2018_
|
||||
## v0.2.0 - _May 5, 2018_
|
||||
|
||||
* Removed portal specific colors
|
||||
|
||||
## v0.1.6 - _May 4, 2018_
|
||||
## v0.1.6 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/react-shared",
|
||||
"version": "1.0.6",
|
||||
"version": "1.0.7",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -24,8 +24,8 @@
|
||||
"url": "https://github.com/0xProject/0x-monorepo.git"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"copyfiles": "^2.0.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
"shx": "^0.2.2",
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
"note": "Export types: `CompilerSettings`, `OutputField`",
|
||||
"pr": 924
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
|
||||
@@ -5,7 +5,13 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v1.1.0 - _August 24, 2018_
|
||||
|
||||
* Quicken compilation by sending multiple contracts to the same solcjs invocation, batching them together based on compiler version requirements. (#965)
|
||||
* Stop exporting types: `ContractArtifact`, `ContractNetworks` (#924)
|
||||
* Export types: `CompilerSettings`, `OutputField` (#924)
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -25,7 +31,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -51,7 +57,7 @@ CHANGELOG
|
||||
* Properly export the executable binary (#588)
|
||||
* Add the ability to define a specific solidity version (#589)
|
||||
|
||||
## v0.4.3 - _May 4, 2018_
|
||||
## v0.4.3 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/sol-compiler",
|
||||
"version": "1.0.5",
|
||||
"version": "1.1.0",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -42,8 +42,8 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/mkdirp": "^0.5.2",
|
||||
"@types/require-from-string": "^1.2.0",
|
||||
"@types/semver": "^5.5.0",
|
||||
@@ -65,16 +65,16 @@
|
||||
"zeppelin-solidity": "1.8.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4",
|
||||
"@0xproject/sol-resolver": "^1.0.5",
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5",
|
||||
"@0xproject/sol-resolver": "^1.0.6",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"@types/yargs": "^11.0.0",
|
||||
"chalk": "^2.3.0",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"lodash": "^4.17.5",
|
||||
"mkdirp": "^0.5.1",
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
"Export types: `JSONRPCRequestPayload`, `Provider`, `JSONRPCErrorCallback`, `JSONRPCResponsePayload`, `JSONRPCRequestPayloadWithMethod`, `NextCallback`, `ErrorCallback`, `OnNextCompleted` and `Callback`",
|
||||
"pr": 924
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "2.0.0",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v2.0.0 - _August 13, 2018_
|
||||
## v2.1.0 - _August 24, 2018_
|
||||
|
||||
* Export types: `JSONRPCRequestPayload`, `Provider`, `JSONRPCErrorCallback`, `JSONRPCResponsePayload`, `JSONRPCRequestPayloadWithMethod`, `NextCallback`, `ErrorCallback`, `OnNextCompleted` and `Callback` (#924)
|
||||
|
||||
## v2.0.0 - _August 14, 2018_
|
||||
|
||||
* Fix a bug when eth_call coverage was not computed because of silent schema validation failures (#938)
|
||||
* Make `TruffleArtifactAdapter` read the `truffle.js` config for `solc` settings (#938)
|
||||
@@ -24,7 +28,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Add artifact adapter as a parameter for `CoverageSubprovider`. Export `AbstractArtifactAdapter` (#589)
|
||||
* Implement `SolCompilerArtifactAdapter` and `TruffleArtifactAdapter` (#589)
|
||||
@@ -57,7 +61,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.1.0 - _May 31, 2018_
|
||||
## v0.1.0 - _June 1, 2018_
|
||||
|
||||
* Incorrect publish that was unpublished
|
||||
|
||||
@@ -65,7 +69,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.10 - _May 4, 2018_
|
||||
## v0.0.10 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/sol-cov",
|
||||
"version": "2.0.0",
|
||||
"version": "2.1.0",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -26,7 +26,10 @@
|
||||
"config": {
|
||||
"postpublish": {
|
||||
"assets": [],
|
||||
"docOmitExports": ["ProfilerSubprovider", "RevertTraceSubprovider"]
|
||||
"docOmitExports": [
|
||||
"ProfilerSubprovider",
|
||||
"RevertTraceSubprovider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"repository": {
|
||||
@@ -39,14 +42,14 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/dev-utils": "^1.0.4",
|
||||
"@0xproject/sol-compiler": "^1.0.5",
|
||||
"@0xproject/subproviders": "^1.0.5",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/web3-wrapper": "^1.2.0",
|
||||
"@0xproject/dev-utils": "^1.0.5",
|
||||
"@0xproject/sol-compiler": "^1.1.0",
|
||||
"@0xproject/subproviders": "^2.0.0",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"@0xproject/web3-wrapper": "^2.0.0",
|
||||
"@types/solidity-parser-antlr": "^0.2.1",
|
||||
"ethereum-types": "^1.0.4",
|
||||
"ethereum-types": "^1.0.5",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"glob": "^7.1.2",
|
||||
"istanbul": "^0.4.5",
|
||||
@@ -58,7 +61,7 @@
|
||||
"solidity-parser-antlr": "^0.2.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/istanbul": "^0.4.30",
|
||||
"@types/loglevel": "^1.5.3",
|
||||
"@types/mkdirp": "^0.5.1",
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.6",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "1.0.5",
|
||||
"changes": [
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v1.0.6 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Fix a bug where RelativeFSResolver would crash when trying to read a directory (#909)
|
||||
* Fix a bug where NpmResolver would crash when trying to read a directory (#961)
|
||||
@@ -26,7 +30,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Fix a bug in FsResolver where it tries to read directories as files (#589)
|
||||
* Fix a bug in NameResolver where it is not ignoring .sol files (#589)
|
||||
@@ -39,7 +43,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.6 - _May 31, 2018_
|
||||
## v0.0.6 - _June 1, 2018_
|
||||
|
||||
* Incorrect publish that was unpublished
|
||||
|
||||
@@ -47,7 +51,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v0.0.4 - _May 4, 2018_
|
||||
## v0.0.4 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/sol-resolver",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"copyfiles": "^2.0.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
"shx": "^0.2.2",
|
||||
@@ -31,8 +31,8 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@0xproject/types": "^1.0.1-rc.4",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/types": "^1.0.1-rc.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"lodash": "^4.17.5"
|
||||
},
|
||||
"publishConfig": {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1535133899,
|
||||
"version": "1.0.6",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1534210131,
|
||||
"version": "1.0.5",
|
||||
|
||||
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.5 - _August 13, 2018_
|
||||
## v1.0.6 - _August 24, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.5 - _August 14, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -25,7 +29,7 @@ CHANGELOG
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
## v1.0.0 - _July 19, 2018_
|
||||
## v1.0.0 - _July 20, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
@@ -57,7 +61,7 @@ CHANGELOG
|
||||
|
||||
* Properly export the executable binary (#588)
|
||||
|
||||
## v0.0.14 - _May 4, 2018_
|
||||
## v0.0.14 - _May 5, 2018_
|
||||
|
||||
* Dependencies updated
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/sra-report",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -34,20 +34,20 @@
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/assert": "^1.0.5",
|
||||
"@0xproject/assert": "^1.0.6",
|
||||
"@0xproject/connect": "1.0.4",
|
||||
"@0xproject/json-schemas": "^0.8.3",
|
||||
"@0xproject/order-utils": "^0.0.9",
|
||||
"@0xproject/types": "^0.8.2",
|
||||
"@0xproject/typescript-typings": "^1.0.4",
|
||||
"@0xproject/utils": "^1.0.5",
|
||||
"@0xproject/typescript-typings": "^1.0.5",
|
||||
"@0xproject/utils": "^1.0.6",
|
||||
"chalk": "^2.3.0",
|
||||
"lodash": "^4.17.5",
|
||||
"newman": "^3.9.3",
|
||||
"yargs": "^10.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/mocha": "^2.2.48",
|
||||
"@types/nock": "^9.1.2",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"domain": "sra-api",
|
||||
"domain": "sra-spec",
|
||||
"build_command": "yarn build-json",
|
||||
"upload_directory": "public",
|
||||
"index_key": "index.html",
|
||||
1
packages/sra-spec/.gitignore
vendored
Normal file
1
packages/sra-spec/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
public/api.json
|
||||
@@ -6,7 +6,8 @@
|
||||
"note": "Add takerAddress to /orders parameters",
|
||||
"pr": 974
|
||||
}
|
||||
]
|
||||
],
|
||||
"timestamp": 1535133899
|
||||
},
|
||||
{
|
||||
"version": "1.0.1-rc.4",
|
||||
14
packages/sra-spec/CHANGELOG.md
Normal file
14
packages/sra-spec/CHANGELOG.md
Normal file
@@ -0,0 +1,14 @@
|
||||
<!--
|
||||
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
|
||||
Edit the package's CHANGELOG.json file only.
|
||||
-->
|
||||
|
||||
CHANGELOG
|
||||
|
||||
## v1.0.1-rc.5 - _August 24, 2018_
|
||||
|
||||
* Add takerAddress to /orders parameters (#974)
|
||||
|
||||
## v1.0.1-rc.4 - _August 14, 2018_
|
||||
|
||||
* Add inital spec for SRA v2 (#916)
|
||||
@@ -1,15 +1,15 @@
|
||||
## @0xproject/sra-api
|
||||
## @0xproject/sra-spec
|
||||
|
||||
Contains the Standard Relayer API [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification).
|
||||
|
||||
The package distributes both a javascript object version and a json version.
|
||||
|
||||
A deployed [ReDoc](https://github.com/Rebilly/ReDoc) static site with the API can be found here http://sra-api.s3-website-us-east-1.amazonaws.com/.
|
||||
A deployed [ReDoc](https://github.com/Rebilly/ReDoc) static site with the API can be found here http://sra-spec.s3-website-us-east-1.amazonaws.com/.
|
||||
|
||||
## Usage
|
||||
|
||||
```
|
||||
import { api } from '@0xproject/sra-api';
|
||||
import { api } from '@0xproject/sra-spec';
|
||||
```
|
||||
|
||||
## Installation
|
||||
@@ -53,18 +53,18 @@ yarn install
|
||||
To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
|
||||
|
||||
```bash
|
||||
PKG=@0xproject/sra-api yarn build
|
||||
PKG=@0xproject/sra-spec yarn build
|
||||
```
|
||||
|
||||
Or continuously rebuild on change:
|
||||
|
||||
```bash
|
||||
PKG=@0xproject/sra-api yarn watch
|
||||
PKG=@0xproject/sra-spec yarn watch
|
||||
```
|
||||
|
||||
### Static Site
|
||||
|
||||
We also [host a static HTML version of the docs on S3](http://sra-api.s3-website-us-east-1.amazonaws.com/) for easy sharing.
|
||||
We also [host a static HTML version of the docs on S3](http://sra-spec.s3-website-us-east-1.amazonaws.com/) for easy sharing.
|
||||
|
||||
To build and deploy the site run
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0xproject/sra-api",
|
||||
"version": "1.0.1-rc.4",
|
||||
"name": "@0xproject/sra-spec",
|
||||
"version": "1.0.1-rc.5",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -31,12 +31,12 @@
|
||||
"bugs": {
|
||||
"url": "https://github.com/0xProject/0x-monorepo/issues"
|
||||
},
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-api/README.md",
|
||||
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md",
|
||||
"dependencies": {
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.4"
|
||||
"@0xproject/json-schemas": "^1.0.1-rc.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0xproject/tslint-config": "^1.0.5",
|
||||
"@0xproject/tslint-config": "^1.0.6",
|
||||
"@loopback/openapi-v3-types": "^0.8.2",
|
||||
"@types/mocha": "^2.2.42",
|
||||
"@types/node": "^10.5.3",
|
||||
@@ -18,7 +18,7 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<redoc spec-url='http://sra-api.s3-website-us-east-1.amazonaws.com/api.json'></redoc>
|
||||
<redoc spec-url='http://sra-spec.s3-website-us-east-1.amazonaws.com/api.json'></redoc>
|
||||
<script src="https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"> </script>
|
||||
</body>
|
||||
</html>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user