crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2-prototype' into feature/combinatorial-testing

Browse Source 
* v2-prototype:
  Prettier fix
  Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility
  Fix missed merge conflicts
  Fix additional versions and update yarn.lock
  Add OrderWatcherConfig type to 0x.js docs page
  Export OrderWatcherConfig from 0x.js
  Update all package versions to match latest published to NPM
  Update CHANGELOG's with publishes performed on development branch
  Rebase with latest removing PROXY_ID from transfer
  Split transfer impl and AssetProxyMixin
  change @0xproject/types to ethereum-types
  remove mistaken comment
  workaround for TypeScript trailing comma bug
  Document contract_templates
This commit is contained in:
Fabio Berger
2018-06-19 13:48:58 +02:00
parent 08ea71cb24 f3ae5d8160
commit 6641f34d76
95 changed files with 1154 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/0x.js/CHANGELOG.json
View File

@@ -1,4 +1,40 @@
[
{
"timestamp": 1529397769,
"version": "0.38.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617805,
"version": "0.38.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617227,
"version": "0.38.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527616612,
"version": "0.38.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.38.0",
"changes": [

18
packages/0x.js/CHANGELOG.md
View File

@@ -5,12 +5,28 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.38.4 - _June 19, 2018_
* Dependencies updated
## v0.38.3 - _May 29, 2018_
* Dependencies updated
## v0.38.2 - _May 29, 2018_
* Dependencies updated
## v0.38.1 - _May 29, 2018_
* Dependencies updated
## v0.38.0 - _May 22, 2018_
* 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

36
packages/0x.js/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "0.38.0",
"version": "0.38.4",
"engines": {
"node": ">=6.12"
},
@@ -69,12 +69,12 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/migrations": "^0.0.6",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/migrations": "^0.0.8",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
@@ -100,18 +100,18 @@
"webpack": "^3.1.0"
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/base-contract": "^0.3.2",
"@0xproject/contract-wrappers": "^0.0.2",
"@0xproject/order-utils": "0.0.5",
"@0xproject/order-watcher": "^0.0.2",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/types": "0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/assert": "^0.2.12",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/contract-wrappers": "^0.0.5",
"@0xproject/order-utils": "^0.0.7",
"@0xproject/order-watcher": "^0.0.6",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
"publishConfig": {

2
packages/0x.js/src/index.ts
View File

@@ -19,6 +19,8 @@ export {
TransactionReceiptWithDecodedLogs,
} from '@0xproject/types';
export { OrderWatcherConfig } from '@0xproject/order-watcher';
export {
EventCallback,
ContractEvent,

18
packages/abi-gen/CHANGELOG.json
View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1529397769,
"version": "0.3.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.3.1",
"changes": [
{
"note": "Incorrect publish that was unpublished"
}
],
"timestamp": 1527810075
},
{
"version": "0.3.0",
"changes": [

10
packages/abi-gen/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.3.2 - _June 19, 2018_
* Dependencies updated
## v0.3.1 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.3.0 - _May 22, 2018_
* Properly export the executable binary (#588)
## v0.2.13 - _May 4, 2018_
## v0.2.13 - _May 5, 2018_
* Dependencies updated

10
packages/abi-gen/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/abi-gen",
"version": "0.3.0",
"version": "0.3.2",
"engines": {
"node": ">=6.12"
},
@@ -27,8 +27,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"ethereum-types": "^0.0.1",
"chalk": "^2.3.0",
"glob": "^7.1.2",
@@ -39,8 +39,8 @@
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/glob": "^5.0.33",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",

18
packages/assert/CHANGELOG.json
View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1529397769,
"version": "0.2.12",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.2.11",
"changes": [
{
"note": "Incorrect publish that was unpublished"
}
],
"timestamp": 1527810075
},
{
"timestamp": 1527008270,
"version": "0.2.10",

10
packages/assert/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.2.12 - _June 19, 2018_
* Dependencies updated
## v0.2.11 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.2.10 - _May 22, 2018_
* Dependencies updated
## v0.2.9 - _May 4, 2018_
## v0.2.9 - _May 5, 2018_
* Dependencies updated

12
packages/assert/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/assert",
"version": "0.2.10",
"version": "0.2.12",
"engines": {
"node": ">=6.12"
},
@@ -31,8 +31,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
@@ -48,9 +48,9 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/json-schemas": "0.7.22",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"lodash": "^4.17.4",
"valid-url": "^1.0.9"
},

19
packages/base-contract/CHANGELOG.json
View File

@@ -1,4 +1,23 @@
[
{
"version": "0.3.4",
"changes": [
{
"note":
"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"
}
],
"timestamp": 1529397769
},
{
"timestamp": 1527810075,
"version": "0.3.3",
"changes": [
{
"note": "Incorrect publish that was unpublished"
}
]
},
{
"timestamp": 1527008270,
"version": "0.3.2",

10
packages/base-contract/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.3.4 - _June 19, 2018_
* 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 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.3.2 - _May 22, 2018_
* Dependencies updated
## v0.3.1 - _May 4, 2018_
## v0.3.1 - _May 5, 2018_
* Dependencies updated

14
packages/base-contract/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/base-contract",
"version": "0.3.2",
"version": "0.3.4",
"engines": {
"node": ">=6.12"
},
@@ -30,8 +30,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
@@ -44,10 +44,10 @@
},
"dependencies": {
"ethereum-types": "^0.0.1",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
"publishConfig": {

18
packages/connect/CHANGELOG.json
View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1529397769,
"version": "0.6.15",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527616612,
"version": "0.6.14",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527008270,
"version": "0.6.13",

10
packages/connect/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.6.15 - _June 19, 2018_
* Dependencies updated
## v0.6.14 - _May 29, 2018_
* Dependencies updated
## v0.6.13 - _May 22, 2018_
* Dependencies updated
## v0.6.12 - _May 4, 2018_
## v0.6.12 - _May 5, 2018_
* Dependencies updated

16
packages/connect/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
"version": "0.6.13",
"version": "0.6.15",
"engines": {
"node": ">=6.12"
},
@@ -51,19 +51,19 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/json-schemas": "0.7.22",
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/assert": "^0.2.12",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
"query-string": "^5.0.1",
"websocket": "^1.0.25"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/fetch-mock": "^5.12.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",

12
packages/contract-wrappers/CHANGELOG.json
View File

@@ -1,6 +1,16 @@
[
{
"version": "0.1.0",
"timestamp": 1529397769,
"version": "0.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617227,
"version": "0.0.4",
"changes": [
{
"note": "Expose 'abi' ContractAbi property on all contract wrappers"

12
packages/contract-wrappers/CHANGELOG.md
View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.5 - _June 19, 2018_
* Dependencies updated
## v0.0.4 - _May 29, 2018_
* Dependencies updated
## v0.0.3 - _May 29, 2018_
* Dependencies updated
## v0.0.2 - _May 22, 2018_
* Dependencies updated

36
packages/contract-wrappers/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/contract-wrappers",
"version": "0.0.2",
"version": "0.0.5",
"description": "Smart TS wrappers for 0x smart contracts",
"keywords": [
"0xproject",
@@ -46,13 +46,13 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/migrations": "^0.0.6",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/subproviders": "^0.10.2",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/migrations": "^0.0.8",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/subproviders": "^0.10.4",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
@@ -77,19 +77,19 @@
"web3-provider-engine": "^14.0.4"
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/base-contract": "^0.3.2",
"@0xproject/fill-scenarios": "^0.0.2",
"@0xproject/json-schemas": "0.7.22",
"@0xproject/order-utils": "0.0.5",
"@0xproject/types": "0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/assert": "^0.2.12",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/fill-scenarios": "^0.0.4",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/order-utils": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"ethereumjs-blockstream": "^2.0.6",
"ethereumjs-util": "^5.1.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"uuid": "^3.1.0"

17
packages/contract_templates/README.md Normal file
View File

@@ -0,0 +1,17 @@
These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen).
To successfully compile the generated TypeScript contract wrappers, you must:
* Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/utils @0xproject/web3-wrapper ethereum-types ethers lodash`
* Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
* Ensure that your TypeScript configuration includes the following:
```
"compilerOptions": {
"lib": ["ES2015"],
"typeRoots": [
"node_modules/@0xproject/typescript-typings/types",
"node_modules/@types"
]
}
```

4
packages/contract_templates/contract.handlebars
View File

@@ -1,7 +1,3 @@
/**
* This file is auto-generated using abi-gen. Don't edit directly.
* Templates can be found at https://github.com/0xProject/0x-monorepo/tree/development/packages/contract_templates.
*/
// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace
// tslint:disable:no-unused-variable
import { BaseContract } from '@0xproject/base-contract';

2
packages/contract_templates/partials/params.handlebars
View File

@@ -1,3 +1,3 @@
{{#each inputs}}
{{name}},
{{name}}{{#if @last}}{{else}},{{/if}}
{{/each}}

24
packages/contracts/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "contracts",
"version": "2.1.29",
"version": "2.1.33",
"engines": {
"node": ">=6.12"
},
@@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/subproviders": "^0.10.1",
"@0xproject/sol-cov": "^0.0.11",
"@0xproject/sol-cov": "^0.1.1",
"@types/lodash": "4.14.104",
"@types/bn.js": "^4.11.0",
"@types/node": "^8.0.53",
@@ -71,18 +71,18 @@
"yargs": "^10.0.3"
},
"dependencies": {
"@0xproject/base-contract": "^0.3.2",
"@0xproject/order-utils": "^0.0.6",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/types": "^1.0.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-util": "^5.1.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4",
"web3": "^0.20.0"
}

59
packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
View File

@@ -22,69 +22,16 @@ pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "./MixinAssetProxy.sol";
import "./MixinAuthorizable.sol";
import "../../tokens/ERC20Token/IERC20Token.sol";
import "./MixinERC20Transfer.sol";
contract ERC20Proxy is
LibBytes,
MixinAssetProxy,
MixinAuthorizable
MixinAuthorizable,
MixinERC20Transfer
{
// Id of this proxy.
uint8 constant PROXY_ID = 1;
/// @dev Internal version of `transferFrom`.
/// @param assetData Encoded byte array.
/// @param from Address to transfer asset from.
/// @param to Address to transfer asset to.
/// @param amount Amount of asset to transfer.
function transferFromInternal(
bytes memory assetData,
address from,
address to,
uint256 amount
)
internal
{
// Decode asset data.
address token = readAddress(assetData, 0);
// Transfer tokens.
// We do a raw call so we can check the success separate
// from the return data.
bool success = token.call(abi.encodeWithSelector(
IERC20Token(token).transferFrom.selector,
from,
to,
amount
));
require(
success,
TRANSFER_FAILED
);
// Check return data.
// If there is no return data, we assume the token incorrectly
// does not return a bool. In this case we expect it to revert
// on failure, which was handled above.
// If the token does return data, we require that it is a single
// value that evaluates to true.
assembly {
if returndatasize {
success := 0
if eq(returndatasize, 32) {
// First 64 bytes of memory are reserved scratch space
returndatacopy(0, 0, 32)
success := mload(0)
}
}
}
require(
success,
TRANSFER_FAILED
);
}
/// @dev Gets the proxy id associated with the proxy address.
/// @return Proxy id.
function getProxyId()

72
packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
View File

@@ -22,52 +22,16 @@ pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "./MixinAssetProxy.sol";
import "./MixinAuthorizable.sol";
import "../../tokens/ERC721Token/ERC721Token.sol";
import "./MixinERC721Transfer.sol";
contract ERC721Proxy is
LibBytes,
MixinAssetProxy,
MixinAuthorizable
MixinAuthorizable,
MixinERC721Transfer
{
// Id of this proxy.
uint8 constant PROXY_ID = 2;
/// @dev Internal version of `transferFrom`.
/// @param assetData Encoded byte array.
/// @param from Address to transfer asset from.
/// @param to Address to transfer asset to.
/// @param amount Amount of asset to transfer.
function transferFromInternal(
bytes memory assetData,
address from,
address to,
uint256 amount
)
internal
{
// There exists only 1 of each token.
require(
amount == 1,
INVALID_AMOUNT
);
// Decode asset data.
(
address token,
uint256 tokenId,
bytes memory receiverData
) = decodeERC721AssetData(assetData);
// Transfer token. Saves gas by calling safeTransferFrom only
// when there is receiverData present. Either succeeds or throws.
if (receiverData.length > 0) {
ERC721Token(token).safeTransferFrom(from, to, tokenId, receiverData);
} else {
ERC721Token(token).transferFrom(from, to, tokenId);
}
}
/// @dev Gets the proxy id associated with the proxy address.
/// @return Proxy id.
function getProxyId()
@@ -77,34 +41,4 @@ contract ERC721Proxy is
{
return PROXY_ID;
}
/// @dev Decodes ERC721 Asset data.
/// @param assetData Encoded byte array.
/// @return proxyId Intended ERC721 proxy id.
/// @return token ERC721 token address.
/// @return tokenId ERC721 token id.
/// @return receiverData Additional data with no specific format, which
/// is passed to the receiving contract's onERC721Received.
function decodeERC721AssetData(bytes memory assetData)
internal
pure
returns (
address token,
uint256 tokenId,
bytes memory receiverData
)
{
// Decode asset data.
token = readAddress(assetData, 0);
tokenId = readUint256(assetData, 20);
if (assetData.length > 52) {
receiverData = readBytes(assetData, 52);
}
return (
token,
tokenId,
receiverData
);
}
}

81
packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol Normal file
View File

@@ -0,0 +1,81 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "../../tokens/ERC20Token/IERC20Token.sol";
import "./libs/LibTransferErrors.sol";
contract MixinERC20Transfer is
LibBytes,
LibTransferErrors
{
/// @dev Internal version of `transferFrom`.
/// @param assetData Encoded byte array.
/// @param from Address to transfer asset from.
/// @param to Address to transfer asset to.
/// @param amount Amount of asset to transfer.
function transferFromInternal(
bytes memory assetData,
address from,
address to,
uint256 amount
)
internal
{
// Decode asset data.
address token = readAddress(assetData, 0);
// Transfer tokens.
// We do a raw call so we can check the success separate
// from the return data.
bool success = token.call(abi.encodeWithSelector(
IERC20Token(token).transferFrom.selector,
from,
to,
amount
));
require(
success,
TRANSFER_FAILED
);
// Check return data.
// If there is no return data, we assume the token incorrectly
// does not return a bool. In this case we expect it to revert
// on failure, which was handled above.
// If the token does return data, we require that it is a single
// value that evaluates to true.
assembly {
if returndatasize {
success := 0
if eq(returndatasize, 32) {
// First 64 bytes of memory are reserved scratch space
returndatacopy(0, 0, 32)
success := mload(0)
}
}
}
require(
success,
TRANSFER_FAILED
);
}
}

94
packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol Normal file
View File

@@ -0,0 +1,94 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "../../tokens/ERC721Token/ERC721Token.sol";
import "./libs/LibTransferErrors.sol";
contract MixinERC721Transfer is
LibBytes,
LibTransferErrors
{
/// @dev Internal version of `transferFrom`.
/// @param assetData Encoded byte array.
/// @param from Address to transfer asset from.
/// @param to Address to transfer asset to.
/// @param amount Amount of asset to transfer.
function transferFromInternal(
bytes memory assetData,
address from,
address to,
uint256 amount
)
internal
{
// There exists only 1 of each token.
require(
amount == 1,
INVALID_AMOUNT
);
// Decode asset data.
(
address token,
uint256 tokenId,
bytes memory receiverData
) = decodeERC721AssetData(assetData);
// Transfer token. Saves gas by calling safeTransferFrom only
// when there is receiverData present. Either succeeds or throws.
if (receiverData.length > 0) {
ERC721Token(token).safeTransferFrom(from, to, tokenId, receiverData);
} else {
ERC721Token(token).transferFrom(from, to, tokenId);
}
}
/// @dev Decodes ERC721 Asset data.
/// @param assetData Encoded byte array.
/// @return proxyId Intended ERC721 proxy id.
/// @return token ERC721 token address.
/// @return tokenId ERC721 token id.
/// @return receiverData Additional data with no specific format, which
/// is passed to the receiving contract's onERC721Received.
function decodeERC721AssetData(bytes memory assetData)
internal
pure
returns (
address token,
uint256 tokenId,
bytes memory receiverData
)
{
// Decode asset data.
token = readAddress(assetData, 0);
tokenId = readUint256(assetData, 20);
if (assetData.length > 52) {
receiverData = readBytes(assetData, 52);
}
return (
token,
tokenId,
receiverData
);
}
}

4
packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
View File

@@ -25,8 +25,4 @@ contract LibAssetProxyErrors {
string constant TARGET_ALREADY_AUTHORIZED = "TARGET_ALREADY_AUTHORIZED"; // Target address must not already be authorized.
string constant INDEX_OUT_OF_BOUNDS = "INDEX_OUT_OF_BOUNDS"; // Specified array index is out of bounds.
string constant AUTHORIZED_ADDRESS_MISMATCH = "AUTHORIZED_ADDRESS_MISMATCH"; // Address at index does not match given target address.
/// AssetProxy errors ///
string constant INVALID_AMOUNT = "INVALID_AMOUNT"; // Transfer amount must equal 1.
string constant TRANSFER_FAILED = "TRANSFER_FAILED"; // Transfer failed.
}

25
packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibTransferErrors.sol Normal file
View File

@@ -0,0 +1,25 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.4.24;
contract LibTransferErrors {
/// Transfer errors ///
string constant INVALID_AMOUNT = "INVALID_AMOUNT"; // Transfer amount must equal 1.
string constant TRANSFER_FAILED = "TRANSFER_FAILED"; // Transfer failed.
}

9
packages/dev-utils/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.4.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.4.3",
"changes": [

10
packages/dev-utils/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.4.4 - _June 19, 2018_
* Dependencies updated
## v0.4.3 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.4.2 - _May 22, 2018_
* Move callbackErrorReporter over from 0x.js (#579)
## v0.4.1 - _May 4, 2018_
## v0.4.1 - _May 5, 2018_
* Dependencies updated

14
packages/dev-utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/dev-utils",
"version": "0.4.2",
"version": "0.4.4",
"engines": {
"node": ">=6.12"
},
@@ -30,8 +30,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
@@ -45,11 +45,11 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/subproviders": "^0.10.2",
"@0xproject/types": "^0.7.0",
"@0xproject/subproviders": "^0.10.4",
"@0xproject/types": "^0.8.1",
"ethereum-types": "^0.0.1",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/web3-wrapper": "^0.7.1",
"lodash": "^4.17.4",
"web3": "^0.20.0",
"web3-provider-engine": "^14.0.4"

4
packages/ethereum-types/package.json
View File

@@ -35,8 +35,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",

15
packages/fill-scenarios/CHANGELOG.json
View File

@@ -1,10 +1,19 @@
[
{
"version": "0.1.0",
"timestamp": 1529397769,
"version": "0.0.4",
"changes": [
{
"note": "Make fill-scenarios compatible with V2 of 0x protocol",
"pr": 656
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527616612,
"version": "0.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},

8
packages/fill-scenarios/CHANGELOG.md
View File

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.4 - _June 19, 2018_
* Dependencies updated
## v0.0.3 - _May 29, 2018_
* Dependencies updated
## v0.0.2 - _May 22, 2018_
* Dependencies updated

20
packages/fill-scenarios/package.json
View File

@@ -28,10 +28,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
@@ -41,14 +41,14 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/base-contract": "^0.3.2",
"@0xproject/order-utils": "^0.0.6",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/types": "1.0.0",
"ethereum-types": "^0.0.1",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
"publishConfig": {

9
packages/json-schemas/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.8.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.8.0",
"changes": [

10
packages/json-schemas/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.8.1 - _June 19, 2018_
* Dependencies updated
## v0.8.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.7.24 - _May 22, 2018_
* Dependencies updated
## v0.7.23 - _May 4, 2018_
## v0.7.23 - _May 5, 2018_
* Dependencies updated

8
packages/json-schemas/package.json
View File

@@ -47,15 +47,15 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
"dependencies": {
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/typescript-typings": "^0.4.1",
"@types/node": "^8.0.53",
"jsonschema": "^1.2.0",
"lodash.values": "^4.3.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/utils": "^0.6.2",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/utils": "^0.7.1",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",

24
packages/metacoin/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/metacoin",
"version": "0.0.7",
"version": "0.0.8",
"engines": {
"node": ">=6.12"
},
@@ -29,22 +29,22 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/base-contract": "^0.3.2",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/sol-cov": "^0.0.11",
"@0xproject/subproviders": "^0.10.2",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/types": "^0.7.0",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/sol-cov": "^0.1.1",
"@0xproject/subproviders": "^0.10.4",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/types": "^0.8.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4",
"web3-provider-engine": "^14.0.4"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/dev-utils": "^0.4.4",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",

9
packages/migrations/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.0.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.0.7",
"changes": [

10
packages/migrations/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.8 - _June 19, 2018_
* Dependencies updated
## v0.0.7 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.0.6 - _May 22, 2018_
* Dependencies updated
## v0.0.5 - _May 4, 2018_
## v0.0.5 - _May 5, 2018_
* Dependencies updated

22
packages/migrations/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/migrations",
"version": "0.0.6",
"version": "0.0.8",
"engines": {
"node": ">=6.12"
},
@@ -36,10 +36,10 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/types": "^0.7.0",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/types": "^0.8.1",
"@types/yargs": "^10.0.0",
"yargs": "^10.0.3",
"make-promises-safe": "^1.1.0",
@@ -49,13 +49,13 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/base-contract": "^0.3.2",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
"publishConfig": {

10
packages/monorepo-scripts/CHANGELOG.json
View File

@@ -1,5 +1,15 @@
[
{
"timestamp": 1529397769,
"version": "0.2.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1529081166,
"version": "0.2.0",
"changes": [
{

8
packages/monorepo-scripts/CHANGELOG.md
View File

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.2.1 - _June 19, 2018_
* Dependencies updated
## v0.2.0 - _June 15, 2018_
* Add `prepublish_checks` script (#650)
## v0.1.20 - _May 22, 2018_
* Dependencies updated

2
packages/monorepo-scripts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/monorepo-scripts",
"version": "0.1.20",
"version": "0.2.1",
"engines": {
"node": ">=6.12"
},

11
packages/order-utils/CHANGELOG.json
View File

@@ -1,18 +1,19 @@
[
{
"timestamp": 1529397769,
"version": "0.0.7",
"changes": [
{
"note": "Export parseECSignature method",
"pr": 684
"note": "Dependencies updated"
}
]
},
{
"version": "0.1.0",
"timestamp": 1527616612,
"version": "0.0.6",
"changes": [
{
"note": "Make order-utils compatible with V2 of 0x protocol",
"pr": 636
"note": "Dependencies updated"
}
]
},

10
packages/order-utils/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.7 - _June 19, 2018_
* Dependencies updated
## v0.0.6 - _May 29, 2018_
* Dependencies updated
## v0.0.5 - _May 22, 2018_
* 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

24
packages/order-utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-utils",
"version": "0.0.6",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -51,10 +51,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/migrations": "^0.0.6",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/migrations": "^0.0.8",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/ethereumjs-abi": "^0.6.0",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
@@ -73,20 +73,20 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/base-contract": "^0.3.2",
"@0xproject/assert": "^0.2.12",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/json-schemas": "1.0.0",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/types": "^1.0.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"@types/node": "^8.0.53",
"bn.js": "^4.11.8",
"ethereum-types": "^0.0.1",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-util": "^5.1.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
"publishConfig": {

36
packages/order-watcher/CHANGELOG.json
View File

@@ -1,4 +1,40 @@
[
{
"timestamp": 1529397769,
"version": "0.0.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617805,
"version": "0.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617227,
"version": "0.0.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527616612,
"version": "0.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527008794,
"version": "0.0.2",

16
packages/order-watcher/CHANGELOG.md
View File

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.6 - _June 19, 2018_
* Dependencies updated
## v0.0.5 - _May 29, 2018_
* Dependencies updated
## v0.0.4 - _May 29, 2018_
* Dependencies updated
## v0.0.3 - _May 29, 2018_
* Dependencies updated
## v0.0.2 - _May 22, 2018_
* Dependencies updated

36
packages/order-watcher/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-watcher",
"version": "0.0.2",
"version": "0.0.6",
"description": "An order watcher daemon that watches for order validity",
"keywords": [
"0x",
@@ -47,12 +47,12 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.3.0",
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/migrations": "^0.0.6",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/abi-gen": "^0.3.2",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/migrations": "^0.0.8",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/tslint-config": "^0.4.20",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -77,19 +77,19 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/base-contract": "^0.3.2",
"@0xproject/contract-wrappers": "^0.0.2",
"@0xproject/fill-scenarios": "^0.0.2",
"@0xproject/json-schemas": "0.7.22",
"@0xproject/order-utils": "0.0.5",
"@0xproject/types": "0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/assert": "^0.2.12",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/contract-wrappers": "^0.0.5",
"@0xproject/fill-scenarios": "^0.0.4",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/order-utils": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"bintrees": "^1.0.2",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
"publishConfig": {

6
packages/react-docs-example/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/react-docs-example",
"version": "0.0.12",
"version": "0.0.13",
"engines": {
"node": ">=6.12"
},
@@ -26,7 +26,7 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
@@ -50,7 +50,7 @@
"webpack-dev-server": "^2.11.1"
},
"dependencies": {
"@0xproject/react-docs": "^0.0.12",
"@0xproject/react-docs": "^0.0.14",
"basscss": "^8.0.3",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",

18
packages/react-docs/CHANGELOG.json
View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1529397769,
"version": "0.0.14",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.0.13",
"changes": [
{
"note": "Incorrect publish that was unpublished"
}
],
"timestamp": 1527810075
},
{
"timestamp": 1527009133,
"version": "0.0.12",

10
packages/react-docs/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.14 - _June 19, 2018_
* Dependencies updated
## v0.0.13 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.0.12 - _May 22, 2018_
* Dependencies updated
## v0.0.11 - _May 4, 2018_
## v0.0.11 - _May 5, 2018_
* Dependencies updated

12
packages/react-docs/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-docs",
"version": "0.0.12",
"version": "0.0.14",
"engines": {
"node": ">=6.12"
},
@@ -25,9 +25,9 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/compare-versions": "^3.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
@@ -36,8 +36,8 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/react-shared": "^0.1.7",
"@0xproject/utils": "^0.6.2",
"@0xproject/react-shared": "^0.2.1",
"@0xproject/utils": "^0.7.1",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",

12
packages/react-shared/CHANGELOG.json
View File

@@ -1,7 +1,15 @@
[
{
"timestamp": 1527009133,
"version": "0.1.7",
"timestamp": 1529397769,
"version": "0.2.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.2.0",
"changes": [
{
"note": "Dependencies updated"

10
packages/react-shared/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.2.1 - _June 19, 2018_
* Dependencies updated
## v0.2.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.1.7 - _May 22, 2018_
* Dependencies updated
## v0.1.6 - _May 4, 2018_
## v0.1.6 - _May 5, 2018_
* Dependencies updated

8
packages/react-shared/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-shared",
"version": "0.1.7",
"version": "0.2.1",
"engines": {
"node": ">=6.12"
},
@@ -25,9 +25,9 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",

9
packages/sol-compiler/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.5.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.5.1",
"changes": [

10
packages/sol-compiler/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.5.2 - _June 19, 2018_
* Dependencies updated
## v0.5.1 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.5.0 - _May 22, 2018_
* Properly export the executable binary (#588)
## v0.4.3 - _May 4, 2018_
## v0.4.3 - _May 5, 2018_
* Dependencies updated

22
packages/sol-compiler/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-compiler",
"version": "0.5.0",
"version": "0.5.2",
"engines": {
"node": ">=6.12"
},
@@ -53,9 +53,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/dev-utils": "^0.4.4",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/mkdirp": "^0.5.2",
"@types/require-from-string": "^1.2.0",
"@types/semver": "^5.5.0",
@@ -76,13 +76,13 @@
"zeppelin-solidity": "1.8.0"
},
"dependencies": {
"@0xproject/assert": "0.2.10",
"@0xproject/json-schemas": "0.7.22",
"@0xproject/sol-resolver": "^0.0.5",
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/assert": "0.2.12",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/sol-resolver": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"@types/yargs": "^11.0.0",
"ethereum-types": "^0.0.1",
"chalk": "^2.3.0",

71
packages/sol-cov/CHANGELOG.json
View File

@@ -1,81 +1,24 @@
[
{
"version": "0.2.0",
"timestamp": 1529397769,
"version": "0.1.1",
"changes": [
{
"note": "Fixed a bug causing RegExp to crash if contract code is longer that 32767 characters",
"pr": 675
},
{
"note": "Fixed a bug caused by Geth debug trace depth being 1-indexed",
"pr": 675
},
{
"note": "Fixed a bug when the tool crashed on empty traces",
"pr": 675
},
{
"note": "Use `BlockchainLifecycle` to support reverts on Geth",
"pr": 675
},
{
"note": "Add `ProfilerSubprovider` as a hacky way to profile code using coverage tools",
"pr": 675
},
{
"note": "Collect traces from `estimate_gas` calls",
"pr": 675
},
{
"note": "Fix a race condition caused by not awaiting the transaction before getting a trace",
"pr": 675
},
{
"note": "Add `start`/`stop` functionality to `CoverageSubprovider` and `ProfilerSubprovider`",
"pr": 675
},
{
"note": "Skip interface artifacts with a warning instead of failing",
"pr": 675
},
{
"note": "Fix solcVersion regex in parameter validation",
"pr": 690
},
{
"note": "Fix a bug when in TruffleArtifactsAdapter causing it to throw if compiler.json is not there",
"pr": 690
},
{
"note": "HUGE perf improvements",
"pr": 690
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527009134,
"version": "0.1.0",
"changes": [
{
"note": "Add artifact adapter as a parameter for CoverageSubprovider. Export AbstractArtifactAdapter",
"pr": 589
},
{
"note": "Implement SolCompilerArtifactAdapter and TruffleArtifactAdapter",
"pr": 589
},
{
"note": "Properly parse multi-level traces",
"pr": 589
},
{
"note": "Add support for solidity libraries",
"pr": 589
"note": "Incorrect publish that was unpublished"
}
]
],
"timestamp": 1527810075
},
{
"timestamp": 1527009133,
"timestamp": 1527009134,
"version": "0.0.11",
"changes": [
{

10
packages/sol-cov/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.1.1 - _June 19, 2018_
* Dependencies updated
## v0.1.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.0.11 - _May 22, 2018_
* Dependencies updated
## v0.0.10 - _May 4, 2018_
## v0.0.10 - _May 5, 2018_
* Dependencies updated

18
packages/sol-cov/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-cov",
"version": "0.0.11",
"version": "0.1.1",
"engines": {
"node": ">=6.12"
},
@@ -50,12 +50,12 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
"dependencies": {
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/subproviders": "^0.10.2",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/subproviders": "^0.10.4",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"@0xproject/dev-utils": "^0.4.4",
"ethereum-types": "^0.0.1",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
@@ -68,8 +68,8 @@
"solidity-parser-antlr": "^0.2.12"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/istanbul": "^0.4.30",
"@types/loglevel": "^1.5.3",
"@types/mkdirp": "^0.5.1",

19
packages/sol-resolver/CHANGELOG.json
View File

@@ -1,17 +1,22 @@
[
{
"version": "0.0.5",
"timestamp": 1529397769,
"version": "0.0.7",
"changes": [
{
"note": "Fix a bug in FsResolver where it tries to read directories as files",
"pr": 589
},
{
"note": "Fix a bug in NameResolver where it is not ignoring .sol files",
"pr": 589
"note": "Dependencies updated"
}
]
},
{
"version": "0.0.6",
"changes": [
{
"note": "Incorrect publish that was unpublished"
}
],
"timestamp": 1527810075
},
{
"timestamp": 1527009133,
"version": "0.0.5",

10
packages/sol-resolver/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.0.7 - _June 19, 2018_
* Dependencies updated
## v0.0.6 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.0.5 - _May 22, 2018_
* Dependencies updated
## v0.0.4 - _May 4, 2018_
## v0.0.4 - _May 5, 2018_
* Dependencies updated

8
packages/sol-resolver/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-resolver",
"version": "0.0.5",
"version": "0.0.7",
"engines": {
"node": ">=6.12"
},
@@ -24,8 +24,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -33,7 +33,7 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.7.0",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.0.3",
"lodash": "^4.17.4"
},

36
packages/sra-report/CHANGELOG.json
View File

@@ -1,4 +1,40 @@
[
{
"timestamp": 1529397769,
"version": "0.1.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617805,
"version": "0.1.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527617227,
"version": "0.1.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1527616612,
"version": "0.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.1.0",
"changes": [

18
packages/sra-report/CHANGELOG.md
View File

@@ -5,11 +5,27 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.1.4 - _June 19, 2018_
* Dependencies updated
## v0.1.3 - _May 29, 2018_
* Dependencies updated
## v0.1.2 - _May 29, 2018_
* Dependencies updated
## v0.1.1 - _May 29, 2018_
* Dependencies updated
## v0.1.0 - _May 22, 2018_
* Properly export the executable binary (#588)
## v0.0.14 - _May 4, 2018_
## v0.0.14 - _May 5, 2018_
* Dependencies updated

20
packages/sra-report/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sra-report",
"version": "0.1.0",
"version": "0.1.4",
"engines": {
"node": ">=6.12"
},
@@ -32,21 +32,21 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/types": "0.7.0",
"@0xproject/order-utils": "0.0.5",
"@0xproject/connect": "0.6.12",
"@0xproject/json-schemas": "0.7.22",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/assert": "^0.2.12",
"@0xproject/types": "^0.8.1",
"@0xproject/order-utils": "^0.0.7",
"@0xproject/connect": "0.6.15",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"chalk": "^2.3.0",
"lodash": "^4.17.4",
"newman": "^3.9.3",
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.48",
"@types/nock": "^9.1.2",

9
packages/subproviders/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.10.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.10.3",
"changes": [

10
packages/subproviders/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.10.4 - _June 19, 2018_
* Dependencies updated
## v0.10.3 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.10.2 - _May 22, 2018_
* Dependencies updated
## v0.10.1 - _May 4, 2018_
## v0.10.1 - _May 5, 2018_
* Dependencies updated

16
packages/subproviders/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/subproviders",
"version": "0.10.2",
"version": "0.10.4",
"engines": {
"node": ">=6.12"
},
@@ -40,10 +40,10 @@
}
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/assert": "^0.2.12",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
"ethereum-types": "^0.0.1",
@@ -59,9 +59,9 @@
"web3-provider-engine": "^14.0.4"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/utils": "^0.6.2",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/utils": "^0.7.1",
"@types/bip39": "^2.4.0",
"@types/bn.js": "^4.11.0",
"@types/hdkey": "^0.7.0",

10
packages/testnet-faucets/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/testnet-faucets",
"version": "1.0.30",
"version": "1.0.34",
"engines": {
"node": ">=6.12"
},
@@ -19,9 +19,9 @@
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.38.0",
"@0xproject/subproviders": "^0.10.2",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/subproviders": "^0.10.4",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"body-parser": "^1.17.1",
"ethereumjs-tx": "^1.3.3",
"ethereumjs-util": "^5.1.1",
@@ -32,7 +32,7 @@
"web3-provider-engine": "^14.0.4"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/tslint-config": "^0.4.20",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "4.14.104",

18
packages/tslint-config/CHANGELOG.json
View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1529397769,
"version": "0.4.20",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.4.19",
"changes": [
{
"note": "Incorrect publish that was unpublished"
}
],
"timestamp": 1527810075
},
{
"timestamp": 1527009133,
"version": "0.4.18",

8
packages/tslint-config/CHANGELOG.md
View File

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.4.20 - _June 19, 2018_
* Dependencies updated
## v0.4.19 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.4.18 - _May 22, 2018_
* Dependencies updated

4
packages/tslint-config/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/tslint-config",
"version": "0.4.18",
"version": "0.4.20",
"engines": {
"node": ">=6.12"
},
@@ -34,7 +34,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/monorepo-scripts": "^0.2.1",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",

9
packages/types/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.8.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.8.0",
"changes": [

10
packages/types/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.8.1 - _June 19, 2018_
* Dependencies updated
## v0.8.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.7.0 - _May 22, 2018_
* Moved ExchangeContractErrs, DoneCallback, Token, OrderRelevantState, OrderStateValid, OrderStateInvalid, OrderState, OrderAddresses and OrderValues types from 0x.js (#579)
## v0.6.3 - _May 4, 2018_
## v0.6.3 - _May 5, 2018_
* Dependencies updated

4
packages/types/package.json
View File

@@ -24,8 +24,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",

9
packages/typescript-typings/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1529397769,
"version": "0.4.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.4.0",
"changes": [

10
packages/typescript-typings/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.4.1 - _June 19, 2018_
* Dependencies updated
## v0.4.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.3.2 - _May 22, 2018_
* Dependencies updated
## v0.3.1 - _May 4, 2018_
## v0.3.1 - _May 5, 2018_
* Dependencies updated

4
packages/typescript-typings/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/typescript-typings",
"version": "0.3.2",
"version": "0.4.1",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
"bignumber.js": "~4.1.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/monorepo-scripts": "^0.2.1",
"copyfiles": "^1.2.0",
"shx": "^0.2.2"
},

25
packages/utils/CHANGELOG.json
View File

@@ -1,15 +1,7 @@
[
{
"version": "0.6.3",
"changes": [
{
"note": "Added errorUtils.spawnSwitchErr"
}
]
},
{
"timestamp": 1527009133,
"version": "0.6.2",
"timestamp": 1529397769,
"version": "0.7.1",
"changes": [
{
"note": "Dependencies updated"
@@ -20,8 +12,17 @@
"version": "0.7.0",
"changes": [
{
"note": "Add logUtils.warn",
"pr": 589
"note": "Incorrect publish that was unpublished"
}
],
"timestamp": 1527810075
},
{
"timestamp": 1527009133,
"version": "0.6.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},

10
packages/utils/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.7.1 - _June 19, 2018_
* Dependencies updated
## v0.7.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.6.2 - _May 22, 2018_
* Dependencies updated
## v0.6.1 - _May 4, 2018_
## v0.6.1 - _May 5, 2018_
* Dependencies updated

10
packages/utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/utils",
"version": "0.6.2",
"version": "0.7.1",
"engines": {
"node": ">=6.12"
},
@@ -24,8 +24,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
@@ -36,11 +36,11 @@
},
"dependencies": {
"ethereum-types": "^0.0.1",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/typescript-typings": "^0.4.1",
"@types/node": "^8.0.53",
"ethereumjs-util": "^5.1.1",
"bignumber.js": "~4.1.0",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"web3": "^0.20.0"

10
packages/web3-wrapper/CHANGELOG.json
View File

@@ -1,5 +1,15 @@
[
{
"timestamp": 1529397769,
"version": "0.7.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1528070400,
"version": "0.7.0",
"changes": [
{

10
packages/web3-wrapper/CHANGELOG.md
View File

@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.7.1 - _June 19, 2018_
* Dependencies updated
## v0.7.0 - _June 4, 2018_
* Add default parameters when sending a raw payload
## v0.6.4 - _May 22, 2018_
* Dependencies updated
## v0.6.3 - _May 4, 2018_
## v0.6.3 - _May 5, 2018_
* Dependencies updated

12
packages/web3-wrapper/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/web3-wrapper",
"version": "0.6.4",
"version": "0.7.1",
"engines": {
"node": ">=6.12"
},
@@ -45,8 +45,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
@@ -64,10 +64,10 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"ethereum-types": "^0.0.1",
"ethers": "^3.0.15",
"ethers": "3.0.22",
"lodash": "^4.17.4",
"web3": "^0.20.0"
},

9
packages/web3-wrapper/src/web3_wrapper.ts
View File

@@ -491,8 +491,13 @@ export class Web3Wrapper {
}
private async _sendRawPayloadAsync<A>(payload: Partial<JSONRPCRequestPayload>): Promise<A> {
const sendAsync = this._web3.currentProvider.sendAsync.bind(this._web3.currentProvider);
payload.id = this._jsonRpcRequestId++;
const response = await promisify<JSONRPCResponsePayload>(sendAsync)(payload);
const payloadWithDefaults = {
id: this._jsonRpcRequestId++,
params: [],
jsonrpc: '2.0',
...payload,
};
const response = await promisify<JSONRPCResponsePayload>(sendAsync)(payloadWithDefaults);
const result = response.result;
return result;
}

8
packages/website/md/docs/sol_cov/usage.md
View File

@@ -11,9 +11,6 @@ In order to use `CoverageSubprovider` with your favorite framework you need to p
If you are generating your artifacts with [@0xproject/sol-compiler](LINK) you can use the `SolCompilerArtifactsAdapter` we've implemented for you.
```typescript
<<<<<<< HEAD
import { CoverageSubprovider } from '@0xproject/sol-cov';
=======
import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov';
const artifactsPath = 'src/artifacts';
const contractsPath = 'src/contracts';
@@ -42,7 +39,6 @@ Look at the code of the two adapters above for examples.
```typescript
import { CoverageSubprovider } from '@0xproject/sol-cov';
import ProviderEngine = require('web3-provider-engine');
>>>>>>> Improve sol-cov docs
const provider = new ProviderEngine();
@@ -51,12 +47,8 @@ const contractsPath = 'src/contracts';
const networkId = 50;
// Some calls might not have `from` address specified. Nevertheless - transactions need to be submitted from an address with at least some funds. defaultFromAddress is the address that will be used to submit those calls as transactions from.
const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
<<<<<<< HEAD
const coverageSubprovider = new CoverageSubprovider(artifactsPath, contractsPath, defaultFromAddress);
=======
const isVerbose = true;
const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose);
>>>>>>> Improve sol-cov docs
provider.addProvider(coverageSubprovider);
```

18
packages/website/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
"version": "0.0.33",
"version": "0.0.37",
"engines": {
"node": ">=6.12"
},
@@ -18,14 +18,14 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
"@0xproject/contract-wrappers": "^0.0.2",
"@0xproject/react-docs": "^0.0.12",
"@0xproject/react-shared": "^0.1.7",
"@0xproject/subproviders": "^0.10.2",
"@0xproject/types": "0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@0xproject/contract-wrappers": "^0.0.5",
"@0xproject/react-docs": "^0.0.14",
"@0xproject/react-shared": "^0.2.1",
"@0xproject/subproviders": "^0.10.4",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",

1
packages/website/ts/containers/zero_ex_js_documentation.ts
View File

@@ -173,6 +173,7 @@ const docsInfoConfig: DocsInfoConfig = {
'OrderStateInvalid',
'OrderState',
'OrderStateWatcherConfig',
'OrderWatcherConfig',
'FilterObject',
'OrderRelevantState',
'JSONRPCRequestPayload',

150
yarn.lock
View File

@@ -6,73 +6,43 @@
version "0.3.9"
resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.9.tgz#bb89c645612f8ccfaffac1ca6e3c11f168c9cf59"
"@0xproject/connect@0.6.12":
version "0.6.12"
resolved "https://registry.yarnpkg.com/@0xproject/connect/-/connect-0.6.12.tgz#7d4711804f2c760f0436b5f2ddbf6631aaee36ba"
"@0xproject/fill-scenarios@^0.0.4":
version "0.0.4"
resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.4.tgz#4d23c75abda7e9f117b698c0b8b142af07e0c69e"
dependencies:
"@0xproject/assert" "^0.2.9"
"@0xproject/json-schemas" "^0.7.23"
"@0xproject/types" "^0.6.3"
"@0xproject/typescript-typings" "^0.3.1"
"@0xproject/utils" "^0.6.1"
isomorphic-fetch "^2.2.1"
lodash "^4.17.4"
query-string "^5.0.1"
websocket "^1.0.25"
"@0xproject/base-contract" "^0.3.4"
"@0xproject/order-utils" "^0.0.7"
"@0xproject/types" "^0.8.1"
"@0xproject/typescript-typings" "^0.4.1"
"@0xproject/utils" "^0.7.1"
"@0xproject/web3-wrapper" "^0.7.1"
ethers "3.0.22"
lodash "4.17.10"
"@0xproject/fill-scenarios@^0.0.2":
version "0.0.2"
resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.2.tgz#176ac2cba13f527e84346fbf06da84965a852bab"
"@0xproject/json-schemas@0.8.1", "@0xproject/json-schemas@^0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.8.1.tgz#2613fd9405728bc65f2eb78e86258d44b4925ab0"
dependencies:
"@0xproject/base-contract" "^0.3.2"
"@0xproject/order-utils" "^0.0.5"
"@0xproject/types" "^0.7.0"
"@0xproject/typescript-typings" "^0.3.2"
"@0xproject/utils" "^0.6.2"
"@0xproject/web3-wrapper" "^0.6.4"
ethers "^3.0.15"
lodash "^4.17.4"
"@0xproject/typescript-typings" "^0.4.1"
"@types/node" "9.6.0"
jsonschema "1.2.2"
lodash.values "4.3.0"
"@0xproject/json-schemas@0.7.22":
version "0.7.22"
resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.7.22.tgz#95cbdc9ec0eff3d1920903960284d491eb668f28"
"@0xproject/order-utils@^0.0.7":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.7.tgz#eaa465782ea5745bdad54e1a851533172d993b7c"
dependencies:
"@0xproject/typescript-typings" "^0.3.0"
"@types/node" "^8.0.53"
jsonschema "^1.2.0"
lodash.values "^4.3.0"
"@0xproject/json-schemas@^0.7.23", "@0xproject/json-schemas@^0.7.24":
version "0.7.24"
resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.7.24.tgz#21a12b43ab0ab4aa302d02c4891668cda36b6c64"
dependencies:
"@0xproject/typescript-typings" "^0.3.2"
"@types/node" "^8.0.53"
jsonschema "^1.2.0"
lodash.values "^4.3.0"
"@0xproject/order-utils@0.0.5", "@0xproject/order-utils@^0.0.5":
version "0.0.5"
resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.5.tgz#c8d92a112740b0020e08f13137844f8c183c863b"
dependencies:
"@0xproject/assert" "^0.2.10"
"@0xproject/json-schemas" "^0.7.24"
"@0xproject/types" "^0.7.0"
"@0xproject/typescript-typings" "^0.3.2"
"@0xproject/utils" "^0.6.2"
"@0xproject/web3-wrapper" "^0.6.4"
"@types/node" "^8.0.53"
bn.js "^4.11.8"
ethereumjs-abi "^0.6.4"
ethereumjs-util "^5.1.1"
lodash "^4.17.4"
"@0xproject/types@0.7.0", "@0xproject/types@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.7.0.tgz#fad13925ee92ad4ee1980668a5cb2bed4dcaab8f"
dependencies:
"@types/node" "^8.0.53"
bignumber.js "~4.1.0"
"@0xproject/assert" "^0.2.12"
"@0xproject/json-schemas" "^0.8.1"
"@0xproject/types" "^0.8.1"
"@0xproject/typescript-typings" "^0.4.1"
"@0xproject/utils" "^0.7.1"
"@0xproject/web3-wrapper" "^0.7.1"
"@types/node" "9.6.0"
bn.js "4.11.7"
ethereumjs-abi "0.6.5"
ethereumjs-util "5.1.5"
lodash "4.17.10"
"@0xproject/types@^0.5.0":
version "0.5.0"
@@ -80,11 +50,11 @@
dependencies:
bignumber.js "~4.1.0"
"@0xproject/types@^0.6.3":
version "0.6.3"
resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.6.3.tgz#0bc066967aad4151011b6e478bb707b1afb8504b"
"@0xproject/types@^0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.8.1.tgz#ba436a1054d2ac6362bb0668611af4f52402a54e"
dependencies:
"@types/node" "^8.0.53"
"@types/node" "9.6.0"
bignumber.js "~4.1.0"
"@0xproject/typescript-typings@^0.0.3":
@@ -350,6 +320,10 @@
version "9.6.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.5.tgz#ee700810fdf49ac1c399fc5980b7559b3e5a381d"
"@types/node@9.6.0":
version "9.6.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
"@types/node@^8.0.53":
version "8.10.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.8.tgz#794cba23cc9f8d9715f6543fa8827433b5f5cd3b"
@@ -438,7 +412,7 @@
"@types/glob" "*"
"@types/node" "*"
"@types/semver@^5.5.0":
"@types/semver@5.5.0", "@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
@@ -4068,7 +4042,7 @@ ethereum-common@^0.0.18:
version "0.0.18"
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
ethereumjs-abi@0.6.5, ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
version "0.6.5"
resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf"
dependencies:
@@ -4117,17 +4091,7 @@ ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default, ethe
ethereum-common "^0.0.18"
ethereumjs-util "^5.0.0"
ethereumjs-util@^4.0.1, ethereumjs-util@^4.4.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
dependencies:
bn.js "^4.8.0"
create-hash "^1.1.2"
keccakjs "^0.2.0"
rlp "^2.0.0"
secp256k1 "^3.0.1"
ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
ethereumjs-util@5.1.5, ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
version "5.1.5"
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz#2f02575852627d45622426f25ee4a0b5f377f27a"
dependencies:
@@ -4139,6 +4103,16 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum
safe-buffer "^5.1.1"
secp256k1 "^3.0.1"
ethereumjs-util@^4.0.1, ethereumjs-util@^4.4.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
dependencies:
bn.js "^4.8.0"
create-hash "^1.1.2"
keccakjs "^0.2.0"
rlp "^2.0.0"
secp256k1 "^3.0.1"
ethereumjs-vm@2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.3.3.tgz#05719139e0c4a59e829022964a6048b17d2d84b0"
@@ -4183,7 +4157,7 @@ ethereumjs-wallet@~0.6.0:
utf8 "^2.1.1"
uuid "^2.0.1"
ethers@0xproject/ethers.js#eip-838-reasons, ethers@^3.0.15:
ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
version "3.0.18"
resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447"
dependencies:
@@ -6353,7 +6327,7 @@ isobject@^3.0.0, isobject@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
dependencies:
@@ -6623,6 +6597,10 @@ jsonschema@*, jsonschema@^1.2.0:
version "1.2.4"
resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464"
jsonschema@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
jsprim@^1.2.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -7191,7 +7169,7 @@ lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
lodash.values@^4.3.0:
lodash.values@4.3.0, lodash.values@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
@@ -7201,6 +7179,10 @@ lodash.words@^3.0.0:
dependencies:
lodash._root "^3.0.0"
lodash@4.17.10, lodash@^4.17.10:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
lodash@4.17.2:
version "4.17.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
@@ -7217,10 +7199,6 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5,
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
lodash@^4.17.10:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
lodash@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"