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

Merge branch 'development' of https://github.com/0xProject/0x-monorepo into fix/instant-polling

Browse Source
This commit is contained in:
fragosti 2019-03-22 15:03:15 -07:00
commit 5e228d7232
190 changed files with 8308 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/asset-proxy/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "2.0.0",

4
contracts/asset-proxy/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v2.0.0 - _March 20, 2019_
* Do not reexport external dependencies (#1682)

32
contracts/asset-proxy/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-asset-proxy",
"version": "2.0.0",
"version": "2.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,16 +67,16 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-erc1155": "^1.0.1",
"@0x/contracts-erc20": "^2.0.0",
"@0x/contracts-erc721": "^2.0.0",
"@0x/contracts-utils": "^3.0.0",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-erc1155": "^1.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-erc721": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/coordinator/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "1.0.0",

4
contracts/coordinator/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v1.0.0 - _March 20, 2019_
* Created Coordinator package

32
contracts/coordinator/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-coordinator",
"version": "1.0.0",
"version": "1.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,17 +67,17 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-asset-proxy": "^2.0.0",
"@0x/contracts-erc20": "^2.0.0",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "^2.0.0",
"@0x/contracts-utils": "^3.0.0",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11"

23
contracts/coordinator/test/utils/hash_utils.ts
View File

@ -1,5 +1,4 @@
import { eip712Utils, transactionHashUtils } from '@0x/order-utils';
import { constants } from '@0x/order-utils/lib/src/constants';
import { eip712Utils } from '@0x/order-utils';
import { SignedZeroExTransaction } from '@0x/types';
import { BigNumber, signTypedDataUtils } from '@0x/utils';
import * as _ from 'lodash';
@ -11,25 +10,11 @@ export const hashUtils = {
txOrigin: string,
approvalExpirationTimeSeconds: BigNumber,
): Buffer {
const domain = {
name: constants.COORDINATOR_DOMAIN_NAME,
version: constants.COORDINATOR_DOMAIN_VERSION,
const typedData = eip712Utils.createCoordinatorApprovalTypedData(
transaction,
verifyingContractAddress,
};
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
const approval = {
txOrigin,
transactionHash,
transactionSignature: transaction.signature,
approvalExpirationTimeSeconds: approvalExpirationTimeSeconds.toString(),
};
const typedData = eip712Utils.createTypedData(
constants.COORDINATOR_APPROVAL_SCHEMA.name,
{
CoordinatorApproval: constants.COORDINATOR_APPROVAL_SCHEMA.parameters,
},
approval,
domain,
approvalExpirationTimeSeconds,
);
const hashBuffer = signTypedDataUtils.generateTypedDataHash(typedData);
return hashBuffer;

3
contracts/erc1155/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"timestamp": 1553091633,

4
contracts/erc1155/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v1.0.1 - _March 20, 2019_
* Dependencies updated

24
contracts/erc1155/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc1155",
"version": "1.0.1",
"version": "1.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,12 +66,13 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-utils": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/contracts-utils": "^3.1.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/erc20/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "2.0.0",

4
contracts/erc20/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v2.0.0 - _March 20, 2019_
* Upgrade contracts to Solidity 0.5.5 (#1682)

26
contracts/erc20/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20",
"version": "2.0.0",
"version": "2.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,13 +67,13 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-exchange-libs": "^2.0.0",
"@0x/contracts-utils": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/erc721/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "2.0.0",

4
contracts/erc721/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v2.0.0 - _March 20, 2019_
* Upgrade contracts to Solidity 0.5.5 (#1682)

24
contracts/erc721/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc721",
"version": "2.0.0",
"version": "2.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,12 +67,12 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-utils": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-utils": "^3.1.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/exchange-forwarder/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "2.0.0",

4
contracts/exchange-forwarder/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v2.0.0 - _March 20, 2019_
* Do not reexport external dependencies (#1682)

28
contracts/exchange-forwarder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-forwarder",
"version": "2.0.0",
"version": "2.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,12 +46,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contract-wrappers": "^8.0.4",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contract-wrappers": "^8.0.5",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -68,18 +68,18 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-asset-proxy": "^2.0.0",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "1.0.8",
"@0x/contracts-erc721": "1.0.8",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/exchange-libs/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "2.0.0",

4
contracts/exchange-libs/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v2.0.0 - _March 20, 2019_
* Upgrade contracts to Solidity 0.5.5 (#1682)

26
contracts/exchange-libs/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-libs",
"version": "2.0.0",
"version": "2.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,13 +67,13 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-utils": "^3.0.0",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/exchange/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "2.0.0",

4
contracts/exchange/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v2.0.0 - _March 20, 2019_
* Do not reexport external dependencies (#1682)

36
contracts/exchange/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange",
"version": "2.0.0",
"version": "2.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,18 +67,18 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-asset-proxy": "^2.0.0",
"@0x/contracts-erc1155": "^1.0.1",
"@0x/contracts-erc20": "^2.0.0",
"@0x/contracts-erc721": "^2.0.0",
"@0x/contracts-exchange-libs": "^2.0.0",
"@0x/contracts-utils": "^3.0.0",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc1155": "^1.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-erc721": "^2.1.0",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11"

3
contracts/extensions/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "3.0.0",

4
contracts/extensions/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v3.0.0 - _March 20, 2019_
* Do not reexport external dependencies (#1682)

38
contracts/extensions/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-extensions",
"version": "3.0.0",
"version": "3.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,12 +46,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contract-wrappers": "^8.0.4",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contract-wrappers": "^8.0.5",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -68,18 +68,18 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-asset-proxy": "^2.0.0",
"@0x/contracts-erc20": "^2.0.0",
"@0x/contracts-erc721": "^2.0.0",
"@0x/contracts-exchange": "^2.0.0",
"@0x/contracts-exchange-libs": "^2.0.0",
"@0x/contracts-utils": "^3.0.0",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-erc721": "^2.1.0",
"@0x/contracts-exchange": "^2.1.0",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

3
contracts/multisig/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Run Web3ProviderEngine without excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "3.0.0",

4
contracts/multisig/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)
## v3.0.0 - _March 20, 2019_
* Do not reexport external dependencies (#1682)

26
contracts/multisig/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
"version": "3.0.0",
"version": "3.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,14 +67,14 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/contracts-asset-proxy": "^2.0.0",
"@0x/contracts-erc20": "^2.0.0",
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-utils": "2.0.1",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

9
contracts/test-utils/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "3.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.1.0",
"changes": [

4
contracts/test-utils/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.1 - _March 21, 2019_
* Dependencies updated
## v3.1.0 - _March 20, 2019_
* Added ERC1155Proxy test constants and interfaces (#1661)

26
contracts/test-utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
"version": "3.1.0",
"version": "3.1.1",
"engines": {
"node": ">=6.12"
},
@ -40,19 +40,19 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/dev-utils": "^2.1.4",
"@0x/order-utils": "^7.1.0",
"@0x/sol-compiler": "^3.1.4",
"@0x/sol-coverage": "^3.0.1",
"@0x/sol-profiler": "^3.1.3",
"@0x/sol-trace": "^2.0.9",
"@0x/subproviders": "^4.0.3",
"@0x/abi-gen": "^2.0.8",
"@0x/dev-utils": "^2.2.0",
"@0x/order-utils": "^7.1.1",
"@0x/sol-compiler": "^3.1.5",
"@0x/sol-coverage": "^3.0.2",
"@0x/sol-profiler": "^3.1.4",
"@0x/sol-trace": "^2.0.10",
"@0x/subproviders": "^4.0.4",
"@0x/tslint-config": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@types/bn.js": "^4.11.0",
"@types/js-combinatorics": "^0.5.29",
"@types/lodash": "4.14.104",

3
contracts/utils/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Added `startProviderEngine` to `providerUtils`. Preventing excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"version": "3.0.0",

6
contracts/utils/CHANGELOG.md
View File

@ -5,11 +5,17 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.0 - _March 21, 2019_
* Added `startProviderEngine` to `providerUtils`. Preventing excess block polling (#1695)
## v3.0.0 - _March 20, 2019_
* Optimize loops in LibAddressArray (#1668)
* Upgrade contracts to Solidity 0.5.5 (#1682)
* Added Address.sol with test for whether or not an address is a contract (#1657)
* Add unit tests for `LibAddressArray` (#1712)
* Fix `LibAddressArray.indexOf` returning incorrect index. (#1712)
## v2.0.8 - _March 1, 2019_

24
contracts/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
"version": "3.0.0",
"version": "3.1.0",
"engines": {
"node": ">=6.12"
},
@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/contracts-gen": "^1.0.6",
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
@ -68,12 +68,12 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.3",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"bn.js": "^4.11.8",
"ethereum-types": "^2.1.1",
"ethereumjs-util": "^5.1.1",

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "6.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "6.0.4",

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.0.5 - _March 21, 2019_
* Dependencies updated
## v6.0.4 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "6.0.4",
"version": "6.0.5",
"engines": {
"node": ">=6.12"
},
@ -42,10 +42,10 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/abi-gen-wrappers": "^4.0.3",
"@0x/contract-addresses": "^2.2.3",
"@0x/dev-utils": "^2.1.4",
"@0x/migrations": "^4.0.4",
"@0x/abi-gen-wrappers": "^4.1.0",
"@0x/contract-addresses": "^2.3.0",
"@0x/dev-utils": "^2.2.0",
"@0x/migrations": "^4.1.0",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@ -72,16 +72,16 @@
"webpack": "^4.20.2"
},
"dependencies": {
"@0x/assert": "^2.0.7",
"@0x/base-contract": "^5.0.3",
"@0x/contract-wrappers": "^8.0.4",
"@0x/order-utils": "^7.1.0",
"@0x/order-watcher": "^4.0.4",
"@0x/subproviders": "^4.0.3",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/assert": "^2.0.8",
"@0x/base-contract": "^5.0.4",
"@0x/contract-wrappers": "^8.0.5",
"@0x/order-utils": "^7.1.1",
"@0x/order-watcher": "^4.0.5",
"@0x/subproviders": "^4.0.4",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@types/web3-provider-engine": "^14.0.0",
"ethereum-types": "^2.1.1",
"ethers": "~4.0.4",

10
packages/abi-gen-wrappers/CHANGELOG.json
View File

@ -1,4 +1,14 @@
[
{
"version": "4.1.0",
"changes": [
{
"note": "Add Coordinator and CoordinatorRegistry contract wrappers",
"pr": 1689
}
],
"timestamp": 1553183790
},
{
"timestamp": 1553091633,
"version": "4.0.3",

4
packages/abi-gen-wrappers/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.1.0 - _March 21, 2019_
* Add Coordinator and CoordinatorRegistry contract wrappers (#1689)
## v4.0.3 - _March 20, 2019_
* Dependencies updated

14
packages/abi-gen-wrappers/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen-wrappers",
"version": "4.0.3",
"version": "4.1.0",
"engines": {
"node": ">=6.12"
},
@ -18,7 +18,7 @@
"generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers"
},
"config": {
"abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DutchAuction|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IValidator|IWallet|MultiAssetProxy|OrderValidator|WETH9|ZRXToken).json"
"abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DutchAuction|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IValidator|IWallet|MultiAssetProxy|OrderValidator|WETH9|ZRXToken|Coordinator|CoordinatorRegistry).json"
},
"repository": {
"type": "git",
@ -30,19 +30,19 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/abi-gen": "^2.0.8",
"@0x/abi-gen-templates": "^2.0.1",
"@0x/tslint-config": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/types": "^2.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"ethers": "~4.0.4",
"lodash": "^4.17.11",
"shx": "^0.2.2"
},
"dependencies": {
"@0x/base-contract": "^5.0.3"
"@0x/base-contract": "^5.0.4"
},
"publishConfig": {
"access": "public"

315
packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts Normal file
View File

@ -0,0 +1,315 @@
// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name
// tslint:disable:no-unused-variable
// tslint:disable:no-unbound-method
import { BaseContract } from '@0x/base-contract';
import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, TxData, TxDataPayable, SupportedProvider } from 'ethereum-types';
import { BigNumber, classUtils, logUtils, providerUtils } from '@0x/utils';
import { SimpleContractArtifact } from '@0x/types';
import { Web3Wrapper } from '@0x/web3-wrapper';
import * as ethers from 'ethers';
import * as _ from 'lodash';
// tslint:enable:no-unused-variable
/* istanbul ignore next */
// tslint:disable:no-parameter-reassignment
// tslint:disable-next-line:class-name
export class CoordinatorContract extends BaseContract {
public getSignerAddress = {
async callAsync(
hash: string,
signature: string,
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<string
> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('getSignerAddress(bytes32,bytes)', [hash,
signature
]);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('getSignerAddress(bytes32,bytes)');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<string
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public executeTransaction = {
async sendTransactionAsync(
transaction: {salt: BigNumber;signerAddress: string;data: string},
txOrigin: string,
transactionSignature: string,
approvalExpirationTimeSeconds: BigNumber[],
approvalSignatures: string[],
txData: Partial<TxData> = {},
): Promise<string> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', [transaction,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
]);
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...txData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
self.executeTransaction.estimateGasAsync.bind(
self,
transaction,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
),
);
const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
return txHash;
},
async estimateGasAsync(
transaction: {salt: BigNumber;signerAddress: string;data: string},
txOrigin: string,
transactionSignature: string,
approvalExpirationTimeSeconds: BigNumber[],
approvalSignatures: string[],
txData: Partial<TxData> = {},
): Promise<number> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', [transaction,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
]);
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...txData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
return gas;
},
getABIEncodedTransactionData(
transaction: {salt: BigNumber;signerAddress: string;data: string},
txOrigin: string,
transactionSignature: string,
approvalExpirationTimeSeconds: BigNumber[],
approvalSignatures: string[],
): string {
const self = this as any as CoordinatorContract;
const abiEncodedTransactionData = self._strictEncodeArguments('executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', [transaction,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
]);
return abiEncodedTransactionData;
},
async callAsync(
transaction: {salt: BigNumber;signerAddress: string;data: string},
txOrigin: string,
transactionSignature: string,
approvalExpirationTimeSeconds: BigNumber[],
approvalSignatures: string[],
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<void
> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', [transaction,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
]);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<void
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public assertValidCoordinatorApprovals = {
async callAsync(
transaction: {salt: BigNumber;signerAddress: string;data: string},
txOrigin: string,
transactionSignature: string,
approvalExpirationTimeSeconds: BigNumber[],
approvalSignatures: string[],
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<void
> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('assertValidCoordinatorApprovals((uint256,address,bytes),address,bytes,uint256[],bytes[])', [transaction,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
]);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('assertValidCoordinatorApprovals((uint256,address,bytes),address,bytes,uint256[],bytes[])');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<void
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public EIP712_DOMAIN_HASH = {
async callAsync(
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<string
> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('EIP712_DOMAIN_HASH()', []);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('EIP712_DOMAIN_HASH()');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<string
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public assertValidTransactionOrdersApproval = {
async callAsync(
transaction: {salt: BigNumber;signerAddress: string;data: string},
orders: Array<{makerAddress: string;takerAddress: string;feeRecipientAddress: string;senderAddress: string;makerAssetAmount: BigNumber;takerAssetAmount: BigNumber;makerFee: BigNumber;takerFee: BigNumber;expirationTimeSeconds: BigNumber;salt: BigNumber;makerAssetData: string;takerAssetData: string}>,
txOrigin: string,
transactionSignature: string,
approvalExpirationTimeSeconds: BigNumber[],
approvalSignatures: string[],
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<void
> {
const self = this as any as CoordinatorContract;
const encodedData = self._strictEncodeArguments('assertValidTransactionOrdersApproval((uint256,address,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address,bytes,uint256[],bytes[])', [transaction,
orders,
txOrigin,
transactionSignature,
approvalExpirationTimeSeconds,
approvalSignatures
]);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('assertValidTransactionOrdersApproval((uint256,address,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address,bytes,uint256[],bytes[])');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<void
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public static async deployFrom0xArtifactAsync(
artifact: ContractArtifact | SimpleContractArtifact,
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
_exchange: string,
): Promise<CoordinatorContract> {
if (_.isUndefined(artifact.compilerOutput)) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);
const bytecode = artifact.compilerOutput.evm.bytecode.object;
const abi = artifact.compilerOutput.abi;
return CoordinatorContract.deployAsync(bytecode, abi, provider, txDefaults, _exchange
);
}
public static async deployAsync(
bytecode: string,
abi: ContractAbi,
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
_exchange: string,
): Promise<CoordinatorContract> {
const provider = providerUtils.standardizeOrThrow(supportedProvider);
const constructorAbi = BaseContract._lookupConstructorAbi(abi);
[_exchange
] = BaseContract._formatABIDataItemList(
constructorAbi.inputs,
[_exchange
],
BaseContract._bigNumberToString,
);
const iface = new ethers.utils.Interface(abi);
const deployInfo = iface.deployFunction;
const txData = deployInfo.encode(bytecode, [_exchange
]);
const web3Wrapper = new Web3Wrapper(provider);
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{data: txData},
txDefaults,
web3Wrapper.estimateGasAsync.bind(web3Wrapper),
);
const txHash = await web3Wrapper.sendTransactionAsync(txDataWithDefaults);
logUtils.log(`transactionHash: ${txHash}`);
const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash);
logUtils.log(`Coordinator successfully deployed at ${txReceipt.contractAddress}`);
const contractInstance = new CoordinatorContract(abi, txReceipt.contractAddress as string, provider, txDefaults);
contractInstance.constructorArgs = [_exchange
];
return contractInstance;
}
constructor(abi: ContractAbi, address: string, supportedProvider: SupportedProvider, txDefaults?: Partial<TxData>) {
super('Coordinator', abi, address, supportedProvider, txDefaults);
classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
}
} // tslint:disable:max-file-line-count
// tslint:enable:no-unbound-method

182
packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts Normal file
View File

@ -0,0 +1,182 @@
// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name
// tslint:disable:no-unused-variable
// tslint:disable:no-unbound-method
import { BaseContract } from '@0x/base-contract';
import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, TxData, TxDataPayable, SupportedProvider } from 'ethereum-types';
import { BigNumber, classUtils, logUtils, providerUtils } from '@0x/utils';
import { SimpleContractArtifact } from '@0x/types';
import { Web3Wrapper } from '@0x/web3-wrapper';
import * as ethers from 'ethers';
import * as _ from 'lodash';
// tslint:enable:no-unused-variable
export type CoordinatorRegistryEventArgs =
| CoordinatorRegistryCoordinatorEndpointSetEventArgs;
export enum CoordinatorRegistryEvents {
CoordinatorEndpointSet = 'CoordinatorEndpointSet',
}
export interface CoordinatorRegistryCoordinatorEndpointSetEventArgs extends DecodedLogArgs {
coordinatorOperator: string;
coordinatorEndpoint: string;
}
/* istanbul ignore next */
// tslint:disable:no-parameter-reassignment
// tslint:disable-next-line:class-name
export class CoordinatorRegistryContract extends BaseContract {
public setCoordinatorEndpoint = {
async sendTransactionAsync(
coordinatorEndpoint: string,
txData: Partial<TxData> = {},
): Promise<string> {
const self = this as any as CoordinatorRegistryContract;
const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint
]);
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...txData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
self.setCoordinatorEndpoint.estimateGasAsync.bind(
self,
coordinatorEndpoint
),
);
const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
return txHash;
},
async estimateGasAsync(
coordinatorEndpoint: string,
txData: Partial<TxData> = {},
): Promise<number> {
const self = this as any as CoordinatorRegistryContract;
const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint
]);
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...txData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
return gas;
},
getABIEncodedTransactionData(
coordinatorEndpoint: string,
): string {
const self = this as any as CoordinatorRegistryContract;
const abiEncodedTransactionData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint
]);
return abiEncodedTransactionData;
},
async callAsync(
coordinatorEndpoint: string,
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<void
> {
const self = this as any as CoordinatorRegistryContract;
const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint
]);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('setCoordinatorEndpoint(string)');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<void
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public getCoordinatorEndpoint = {
async callAsync(
coordinatorOperator: string,
callData: Partial<CallData> = {},
defaultBlock?: BlockParam,
): Promise<string
> {
const self = this as any as CoordinatorRegistryContract;
const encodedData = self._strictEncodeArguments('getCoordinatorEndpoint(address)', [coordinatorOperator
]);
const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{
to: self.address,
...callData,
data: encodedData,
},
self._web3Wrapper.getContractDefaults(),
);
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
const abiEncoder = self._lookupAbiEncoder('getCoordinatorEndpoint(address)');
// tslint:disable boolean-naming
const result = abiEncoder.strictDecodeReturnValue<string
>(rawCallResult);
// tslint:enable boolean-naming
return result;
},
};
public static async deployFrom0xArtifactAsync(
artifact: ContractArtifact | SimpleContractArtifact,
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<CoordinatorRegistryContract> {
if (_.isUndefined(artifact.compilerOutput)) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);
const bytecode = artifact.compilerOutput.evm.bytecode.object;
const abi = artifact.compilerOutput.abi;
return CoordinatorRegistryContract.deployAsync(bytecode, abi, provider, txDefaults, );
}
public static async deployAsync(
bytecode: string,
abi: ContractAbi,
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<CoordinatorRegistryContract> {
const provider = providerUtils.standardizeOrThrow(supportedProvider);
const constructorAbi = BaseContract._lookupConstructorAbi(abi);
[] = BaseContract._formatABIDataItemList(
constructorAbi.inputs,
[],
BaseContract._bigNumberToString,
);
const iface = new ethers.utils.Interface(abi);
const deployInfo = iface.deployFunction;
const txData = deployInfo.encode(bytecode, []);
const web3Wrapper = new Web3Wrapper(provider);
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
{data: txData},
txDefaults,
web3Wrapper.estimateGasAsync.bind(web3Wrapper),
);
const txHash = await web3Wrapper.sendTransactionAsync(txDataWithDefaults);
logUtils.log(`transactionHash: ${txHash}`);
const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash);
logUtils.log(`CoordinatorRegistry successfully deployed at ${txReceipt.contractAddress}`);
const contractInstance = new CoordinatorRegistryContract(abi, txReceipt.contractAddress as string, provider, txDefaults);
contractInstance.constructorArgs = [];
return contractInstance;
}
constructor(abi: ContractAbi, address: string, supportedProvider: SupportedProvider, txDefaults?: Partial<TxData>) {
super('CoordinatorRegistry', abi, address, supportedProvider, txDefaults);
classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
}
} // tslint:disable:max-file-line-count
// tslint:enable:no-unbound-method

2
packages/abi-gen-wrappers/src/index.ts
View File

@ -14,3 +14,5 @@ export * from './generated-wrappers/multi_asset_proxy';
export * from './generated-wrappers/order_validator';
export * from './generated-wrappers/weth9';
export * from './generated-wrappers/zrx_token';
export * from './generated-wrappers/coordinator';
export * from './generated-wrappers/coordinator_registry';

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "2.0.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "2.0.7",

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.8 - _March 21, 2019_
* Dependencies updated
## v2.0.7 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen",
"version": "2.0.7",
"version": "2.0.8",
"engines": {
"node": ">=6.12"
},
@ -31,8 +31,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"chalk": "^2.3.0",
"ethereum-types": "^2.1.1",
"glob": "^7.1.2",

9
packages/assert/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "2.0.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "2.0.7",

4
packages/assert/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.8 - _March 21, 2019_
* Dependencies updated
## v2.0.7 - _March 20, 2019_
* Dependencies updated

8
packages/assert/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/assert",
"version": "2.0.7",
"version": "2.0.8",
"engines": {
"node": ">=6.12"
},
@ -44,9 +44,9 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/json-schemas": "^3.0.7",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/json-schemas": "^3.0.8",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"lodash": "^4.17.11",
"valid-url": "^1.0.9"
},

9
packages/asset-buyer/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "6.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "6.0.4",

4
packages/asset-buyer/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.0.5 - _March 21, 2019_
* Dependencies updated
## v6.0.4 - _March 20, 2019_
* Dependencies updated

22
packages/asset-buyer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/asset-buyer",
"version": "6.0.4",
"version": "6.0.5",
"engines": {
"node": ">=6.12"
},
@ -36,16 +36,16 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
"dependencies": {
"@0x/assert": "^2.0.7",
"@0x/connect": "^5.0.3",
"@0x/contract-wrappers": "^8.0.4",
"@0x/json-schemas": "^3.0.7",
"@0x/order-utils": "^7.1.0",
"@0x/subproviders": "^4.0.3",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/assert": "^2.0.8",
"@0x/connect": "^5.0.4",
"@0x/contract-wrappers": "^8.0.5",
"@0x/json-schemas": "^3.0.8",
"@0x/order-utils": "^7.1.1",
"@0x/subproviders": "^4.0.4",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11"
},

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "5.0.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "5.0.3",

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.0.4 - _March 21, 2019_
* Dependencies updated
## v5.0.3 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/base-contract",
"version": "5.0.3",
"version": "5.0.4",
"engines": {
"node": ">=6.12"
},
@ -40,9 +40,9 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"ethers": "~4.0.4",
"lodash": "^4.17.11"

9
packages/connect/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "5.0.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "5.0.3",
"changes": [

4
packages/connect/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.0.4 - _March 21, 2019_
* Dependencies updated
## v5.0.3 - _March 20, 2019_
* Update websocket@^1.0.25 -> websocket@^1.0.26 (#1685)

14
packages/connect/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/connect",
"version": "5.0.3",
"version": "5.0.4",
"engines": {
"node": ">=6.12"
},
@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": {
"@0x/assert": "^2.0.7",
"@0x/json-schemas": "^3.0.7",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/assert": "^2.0.8",
"@0x/json-schemas": "^3.0.8",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"lodash": "^4.17.11",
"query-string": "^6.0.0",
"sinon": "^4.0.0",

8
packages/contract-addresses/CHANGELOG.json
View File

@ -1,13 +1,17 @@
[
{
"version": "2.2.3",
"version": "2.3.0",
"changes": [
{
"note": "Add addresses for coordinator extension contract and coordinator registry",
"pr": 1689
},
{
"note": "Added Dutch Auction mainnet address",
"pr": 1715
}
],
"timestamp": 1553091633
"timestamp": 1553183790
},
{
"version": "2.2.2",

3
packages/contract-addresses/CHANGELOG.md
View File

@ -5,8 +5,9 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.2.3 - _March 20, 2019_
## v2.3.0 - _March 21, 2019_
* Add addresses for coordinator extension contract and coordinator registry (#1689)
* Added Dutch Auction mainnet address (#1715)
## v2.2.2 - _February 25, 2019_

2
packages/contract-addresses/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contract-addresses",
"version": "2.2.3",
"version": "2.3.0",
"engines": {
"node": ">=6.12"
},

12
packages/contract-addresses/src/index.ts
View File

@ -10,6 +10,8 @@ export interface ContractAddresses {
forwarder: string;
orderValidator: string;
dutchAuction: string;
coordinatorRegistry: string;
coordinator: string;
}
export enum NetworkId {
@ -33,6 +35,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
forwarder: '0x5468a1dc173652ee28d249c271fa9933144746b1',
orderValidator: '0x9463e518dea6810309563c81d5266c1b1d149138',
dutchAuction: '0x07b32a653754945666cfca91168bb207323dfe67',
coordinatorRegistry: '0x45797531b873fd5e519477a070a955764c1a5b07',
coordinator: '0x24675738816c87ad37e712cc24f309a0c906187f',
},
3: {
erc20Proxy: '0xb1408f4c245a23c31b98d2c626777d4c0d766caa',
@ -44,6 +48,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
forwarder: '0x2240dab907db71e64d3e0dba4800c83b5c502d4e',
orderValidator: '0x90431a90516ab49af23a0530e04e8c7836e7122f',
dutchAuction: '0x2df6b59309f35ada230ec7d61d7d97355017a1df',
coordinatorRegistry: '0x403cc23e88c17c4652fb904784d1af640a6722d9',
coordinator: '0xc442300dcb4df1ff1db0173e77556dc559de6006',
},
4: {
exchange: '0xbce0b5f6eb618c565c3e5f5cd69652bbc279f44e',
@ -55,6 +61,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
forwarder: '0x2d40589abbdee84961f3a7656b9af7adb0ee5ab4',
orderValidator: '0x0c5173a51e26b29d6126c686756fb9fbef71f762',
dutchAuction: '0xdd7bd6437e67c422879364740ab5855fe3dc41f7',
coordinatorRegistry: '0x1084b6a398e47907bae43fec3ff4b677db6e4fee',
coordinator: '0xc05e6c01b83eeedecac2f7bab9367da4d4c108df',
},
42: {
erc20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e',
@ -66,6 +74,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
forwarder: '0x17992e4ffb22730138e4b62aaa6367fa9d3699a6',
orderValidator: '0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d',
dutchAuction: '0xe11667fb51f34c5367f40d7e379327ce32ee7150',
coordinatorRegistry: '0x09fb99968c016a3ff537bf58fb3d9fe55a7975d5',
coordinator: '0x04b2b090bad68b254881d7eb645a258ce66cc998',
},
// NetworkId 50 represents our Ganache snapshot generated from migrations.
50: {
@ -78,6 +88,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
forwarder: '0x6000eca38b8b5bba64986182fe2a69c57f6b5414',
orderValidator: '0x32eecaf51dfea9618e9bc94e9fbfddb1bbdcba15',
dutchAuction: '0x7e3f4e1deb8d3a05d9d2da87d9521268d0ec3239',
coordinatorRegistry: '0xaa86dda78e9434aca114b6676fc742a18d15a1cc',
coordinator: '0x4d3d5c850dd5bd9d6f4adda3dd039a3c8054ca29',
},
};

10
packages/contract-artifacts/CHANGELOG.json
View File

@ -1,4 +1,14 @@
[
{
"version": "1.4.0",
"changes": [
{
"note": "Added artifact for `Coordinaotr` and `CoordinatorRegistry` contracts",
"pr": 1689
}
],
"timestamp": 1553183790
},
{
"version": "1.3.0",
"changes": [

4
packages/contract-artifacts/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.4.0 - _March 21, 2019_
* Added artifact for `Coordinaotr` and `CoordinatorRegistry` contracts (#1689)
## v1.3.0 - _January 15, 2019_
* Added artifact for `MultiAssetProxy` contract (#1503)

364
packages/contract-artifacts/artifacts/Coordinator.json generated Normal file
View File

File diff suppressed because one or more lines are too long

122
packages/contract-artifacts/artifacts/CoordinatorRegistry.json generated Normal file
View File

File diff suppressed because one or more lines are too long

2
packages/contract-artifacts/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contract-artifacts",
"version": "1.3.0",
"version": "1.4.0",
"engines": {
"node": ">=6.12"
},

4
packages/contract-artifacts/src/index.ts
View File

@ -1,4 +1,6 @@
import * as AssetProxyOwner from '../artifacts/AssetProxyOwner.json';
import * as Coordinator from '../artifacts/Coordinator.json';
import * as CoordinatorRegistry from '../artifacts/CoordinatorRegistry.json';
import * as DummyERC20Token from '../artifacts/DummyERC20Token.json';
import * as DummyERC721Token from '../artifacts/DummyERC721Token.json';
import * as DutchAuction from '../artifacts/DutchAuction.json';
@ -32,4 +34,6 @@ export {
OrderValidator,
WETH9,
ZRXToken,
Coordinator,
CoordinatorRegistry,
};

4
packages/contract-artifacts/tsconfig.json
View File

@ -22,6 +22,8 @@
"./artifacts/MultiAssetProxy.json",
"./artifacts/OrderValidator.json",
"./artifacts/WETH9.json",
"./artifacts/ZRXToken.json"
"./artifacts/ZRXToken.json",
"./artifacts/CoordinatorRegistry.json",
"./artifacts/Coordinator.json"
]
}

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "8.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "8.0.4",

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v8.0.5 - _March 21, 2019_
* Dependencies updated
## v8.0.4 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers",
"version": "8.0.4",
"version": "8.0.5",
"description": "Smart TS wrappers for 0x smart contracts",
"keywords": [
"0xproject",
@ -37,11 +37,11 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/fill-scenarios": "^3.0.3",
"@0x/migrations": "^4.0.4",
"@0x/subproviders": "^4.0.3",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/fill-scenarios": "^3.0.4",
"@0x/migrations": "^4.1.0",
"@0x/subproviders": "^4.0.4",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@ -67,16 +67,16 @@
"web3-provider-engine": "14.0.6"
},
"dependencies": {
"@0x/abi-gen-wrappers": "^4.0.3",
"@0x/assert": "^2.0.7",
"@0x/contract-addresses": "^2.2.3",
"@0x/contract-artifacts": "^1.3.0",
"@0x/json-schemas": "^3.0.7",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/abi-gen-wrappers": "^4.1.0",
"@0x/assert": "^2.0.8",
"@0x/contract-addresses": "^2.3.0",
"@0x/contract-artifacts": "^1.4.0",
"@0x/json-schemas": "^3.0.8",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"ethereumjs-abi": "0.6.5",
"ethereumjs-blockstream": "6.0.0",

9
packages/contracts-gen/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "1.0.7",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "1.0.6",

4
packages/contracts-gen/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.0.7 - _March 21, 2019_
* Dependencies updated
## v1.0.6 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-gen",
"version": "1.0.6",
"version": "1.0.7",
"engines": {
"node": ">=6.12"
},
@ -26,10 +26,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts-gen/README.md",
"dependencies": {
"@0x/sol-resolver": "^2.0.5",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/sol-resolver": "^2.0.6",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"ethereum-types": "^2.1.1",
"lodash": "^4.17.11",
"prettier": "^1.16.3",

4
packages/dev-tools-pages/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/dev-tools-pages",
"version": "0.0.23",
"version": "0.0.24",
"engines": {
"node": ">=6.12"
},
@ -26,7 +26,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@0x/react-shared": "^2.0.8",
"@0x/react-shared": "^2.0.9",
"basscss": "^8.0.3",
"bowser": "^1.9.4",
"highlight.js": "^9.13.1",

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

@ -6,7 +6,8 @@
"note": "Added `startProviderEngine` to `providerUtils`. Preventing excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"timestamp": 1553091633,

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.2.0 - _March 21, 2019_
* Added `startProviderEngine` to `providerUtils`. Preventing excess block polling (#1695)
## v2.1.4 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/dev-utils",
"version": "2.1.4",
"version": "2.2.0",
"engines": {
"node": ">=6.12"
},
@ -41,11 +41,11 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/subproviders": "^4.0.3",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/subproviders": "^4.0.4",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@types/web3-provider-engine": "^14.0.0",
"chai": "^4.0.1",
"ethereum-types": "^2.1.1",

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "3.0.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "3.0.3",

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.0.4 - _March 21, 2019_
* Dependencies updated
## v3.0.3 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/fill-scenarios",
"version": "3.0.3",
"version": "3.0.4",
"description": "0x order fill scenario generator",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@ -28,14 +28,14 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/abi-gen-wrappers": "^4.0.3",
"@0x/base-contract": "^5.0.3",
"@0x/contract-artifacts": "^1.3.0",
"@0x/order-utils": "^7.1.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/abi-gen-wrappers": "^4.1.0",
"@0x/base-contract": "^5.0.4",
"@0x/contract-artifacts": "^1.4.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"ethers": "~4.0.4",
"lodash": "^4.17.11"

20
packages/instant/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/instant",
"version": "1.0.18",
"version": "1.0.19",
"engines": {
"node": ">=6.12"
},
@ -42,15 +42,15 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
"dependencies": {
"@0x/assert": "^2.0.7",
"@0x/asset-buyer": "^6.0.4",
"@0x/json-schemas": "^3.0.7",
"@0x/order-utils": "^7.1.0",
"@0x/subproviders": "^4.0.3",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/assert": "^2.0.8",
"@0x/asset-buyer": "^6.0.5",
"@0x/json-schemas": "^3.0.8",
"@0x/order-utils": "^7.1.1",
"@0x/subproviders": "^4.0.4",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"babel-runtime": "^6.26.0",
"bowser": "^1.9.4",
"copy-to-clipboard": "^3.0.8",

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "3.0.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1553091633,
"version": "3.0.7",

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

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.0.8 - _March 21, 2019_
* Dependencies updated
## v3.0.7 - _March 20, 2019_
* Dependencies updated

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

@ -1,6 +1,6 @@
{
"name": "@0x/json-schemas",
"version": "3.0.7",
"version": "3.0.8",
"engines": {
"node": ">=6.12"
},
@ -39,14 +39,14 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
"dependencies": {
"@0x/typescript-typings": "^4.2.0",
"@0x/typescript-typings": "^4.2.1",
"@types/node": "*",
"jsonschema": "^1.2.0",
"lodash.values": "^4.3.0"
},
"devDependencies": {
"@0x/tslint-config": "^3.0.0",
"@0x/utils": "^4.2.3",
"@0x/utils": "^4.3.0",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",

28
packages/metacoin/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/metacoin",
"version": "0.0.45",
"version": "0.0.46",
"engines": {
"node": ">=6.12"
},
@ -30,18 +30,18 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@0x/abi-gen": "^2.0.7",
"@0x/abi-gen": "^2.0.8",
"@0x/abi-gen-templates": "^2.0.1",
"@0x/base-contract": "^5.0.3",
"@0x/sol-coverage": "^3.0.1",
"@0x/sol-profiler": "^3.1.3",
"@0x/sol-trace": "^2.0.9",
"@0x/subproviders": "^4.0.3",
"@0x/base-contract": "^5.0.4",
"@0x/sol-coverage": "^3.0.2",
"@0x/sol-profiler": "^3.1.4",
"@0x/sol-trace": "^2.0.10",
"@0x/subproviders": "^4.0.4",
"@0x/tslint-config": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@types/mocha": "^2.2.42",
"copyfiles": "^2.0.0",
"ethereum-types": "^2.1.1",
@ -50,9 +50,9 @@
"run-s": "^0.0.0"
},
"devDependencies": {
"@0x/contracts-test-utils": "^3.1.0",
"@0x/dev-utils": "^2.1.4",
"@0x/sol-compiler": "^3.1.4",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0",

7
packages/migrations/CHANGELOG.json
View File

@ -2,11 +2,16 @@
{
"version": "4.1.0",
"changes": [
{
"note": "Add deployment of `Coordinator` and `CoordinatorRegistry` contracts to migration script",
"pr": 1689
},
{
"note": "Added `startProviderEngine` to `providerUtils`. Preventing excess block polling",
"pr": 1695
}
]
],
"timestamp": 1553183790
},
{
"timestamp": 1553091633,

5
packages/migrations/CHANGELOG.md
View File

@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.1.0 - _March 21, 2019_
* Add deployment of `Coordinator` and `CoordinatorRegistry` contracts to migration script (#1689)
* Added `startProviderEngine` to `providerUtils`. Preventing excess block polling (#1695)
## v4.0.4 - _March 20, 2019_
* Dependencies updated

26
packages/migrations/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/migrations",
"version": "4.0.4",
"version": "4.1.0",
"engines": {
"node": ">=6.12"
},
@ -35,9 +35,9 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/dev-utils": "^2.1.4",
"@0x/dev-utils": "^2.2.0",
"@0x/tslint-config": "^3.0.0",
"@0x/types": "^2.2.0",
"@0x/types": "^2.2.1",
"@types/yargs": "^11.0.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
@ -49,16 +49,16 @@
"yargs": "^10.0.3"
},
"dependencies": {
"@0x/abi-gen-wrappers": "^4.0.3",
"@0x/base-contract": "^5.0.3",
"@0x/contract-addresses": "^2.2.3",
"@0x/contract-artifacts": "^1.3.0",
"@0x/order-utils": "^7.1.0",
"@0x/sol-compiler": "^3.1.4",
"@0x/subproviders": "^4.0.3",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/abi-gen-wrappers": "^4.1.0",
"@0x/base-contract": "^5.0.4",
"@0x/contract-addresses": "^2.3.0",
"@0x/contract-artifacts": "^1.4.0",
"@0x/order-utils": "^7.1.1",
"@0x/sol-compiler": "^3.1.5",
"@0x/subproviders": "^4.0.4",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@types/web3-provider-engine": "^14.0.0",
"ethereum-types": "^2.1.1",

17
packages/migrations/src/migration.ts
View File

@ -183,6 +183,21 @@ export async function runMigrationsAsync(
await zrxToken.transfer.sendTransactionAsync(forwarder.address, zrxForwarderAmount, txDefaults),
);
// CoordinatorRegistry
const coordinatorRegistry = await wrappers.CoordinatorRegistryContract.deployFrom0xArtifactAsync(
artifacts.CoordinatorRegistry,
provider,
txDefaults,
);
// Coordinator
const coordinator = await wrappers.CoordinatorContract.deployFrom0xArtifactAsync(
artifacts.Coordinator,
provider,
txDefaults,
exchange.address,
);
const contractAddresses = {
erc20Proxy: erc20Proxy.address,
erc721Proxy: erc721Proxy.address,
@ -193,6 +208,8 @@ export async function runMigrationsAsync(
forwarder: forwarder.address,
orderValidator: orderValidator.address,
dutchAuction: dutchAuction.address,
coordinatorRegistry: coordinatorRegistry.address,
coordinator: coordinator.address,
};
return contractAddresses;

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

@ -1,7 +1,7 @@
{
"private": true,
"name": "@0x/monorepo-scripts",
"version": "1.0.28",
"version": "1.0.29",
"engines": {
"node": ">=6.12"
},
@ -47,8 +47,8 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/types": "^2.2.0",
"@0x/utils": "^4.2.3",
"@0x/types": "^2.2.1",
"@0x/utils": "^4.3.0",
"@lerna/batch-packages": "^3.0.0-beta.18",
"@types/depcheck": "^0.6.0",
"async-child-process": "^1.1.1",

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "7.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "7.1.0",
"changes": [

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

@ -5,10 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v7.1.1 - _March 21, 2019_
* Dependencies updated
## v7.1.0 - _March 20, 2019_
* Add Coordinator EIP712 constants (#1705)
* Added encoding/decoding fdor ERC1155 asset data (#1661)
* Added encoding/decoding for ERC1155 asset data (#1661)
## v7.0.2 - _March 1, 2019_

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

@ -1,6 +1,6 @@
{
"name": "@0x/order-utils",
"version": "7.1.0",
"version": "7.1.1",
"engines": {
"node": ">=6.12"
},
@ -35,7 +35,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
"@0x/dev-utils": "^2.1.4",
"@0x/dev-utils": "^2.2.0",
"@0x/tslint-config": "^3.0.0",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
@ -55,16 +55,16 @@
"web3-provider-engine": "14.0.6"
},
"dependencies": {
"@0x/abi-gen-wrappers": "^4.0.3",
"@0x/assert": "^2.0.7",
"@0x/base-contract": "^5.0.3",
"@0x/contract-addresses": "^2.2.3",
"@0x/contract-artifacts": "^1.3.0",
"@0x/json-schemas": "^3.0.7",
"@0x/types": "^2.2.0",
"@0x/typescript-typings": "^4.2.0",
"@0x/utils": "^4.2.3",
"@0x/web3-wrapper": "^6.0.3",
"@0x/abi-gen-wrappers": "^4.1.0",
"@0x/assert": "^2.0.8",
"@0x/base-contract": "^5.0.4",
"@0x/contract-addresses": "^2.3.0",
"@0x/contract-artifacts": "^1.4.0",
"@0x/json-schemas": "^3.0.8",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@types/node": "*",
"bn.js": "^4.11.8",
"ethereum-types": "^2.1.1",

41
packages/order-utils/src/eip712_utils.ts
View File

@ -6,11 +6,14 @@ import {
EIP712TypedData,
EIP712Types,
Order,
SignedZeroExTransaction,
ZeroExTransaction,
} from '@0x/types';
import { BigNumber } from '@0x/utils';
import * as _ from 'lodash';
import { constants } from './constants';
import { transactionHashUtils } from './transaction_hash';
export const eip712Utils = {
/**
@ -69,7 +72,7 @@ export const eip712Utils = {
/**
* Creates an ExecuteTransaction EIP712TypedData object for use with signTypedData and
* 0x Exchange executeTransaction.
* @param ZeroExTransaction the 0x transaction
* @param zeroExTransaction the 0x transaction
* @return A typed data object
*/
createZeroExTransactionTypedData: (zeroExTransaction: ZeroExTransaction): EIP712TypedData => {
@ -89,4 +92,40 @@ export const eip712Utils = {
);
return typedData;
},
/**
* Creates an Coordiantor typedData EIP712TypedData object for use with the Coordinator extension contract
* @param transaction A 0x transaction
* @param verifyingContractAddress The coordinator extension contract address that will be verifying the typedData
* @param txOrigin The desired `tx.origin` that should be able to submit an Ethereum txn involving this 0x transaction
* @param approvalExpirationTimeSeconds The approvals expiration time
* @return A typed data object
*/
createCoordinatorApprovalTypedData: (
transaction: SignedZeroExTransaction,
verifyingContractAddress: string,
txOrigin: string,
approvalExpirationTimeSeconds: BigNumber,
): EIP712TypedData => {
const domain = {
name: constants.COORDINATOR_DOMAIN_NAME,
version: constants.COORDINATOR_DOMAIN_VERSION,
verifyingContractAddress,
};
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
const approval = {
txOrigin,
transactionHash,
transactionSignature: transaction.signature,
approvalExpirationTimeSeconds: approvalExpirationTimeSeconds.toString(),
};
const typedData = eip712Utils.createTypedData(
constants.COORDINATOR_APPROVAL_SCHEMA.name,
{
CoordinatorApproval: constants.COORDINATOR_APPROVAL_SCHEMA.parameters,
},
approval,
domain,
);
return typedData;
},
};

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

@ -1,4 +1,13 @@
[
{
"timestamp": 1553183790,
"version": "4.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "4.0.4",
"changes": [

Some files were not shown because too many files have changed in this diff Show More