diff options
Diffstat (limited to 'contracts')
35 files changed, 523 insertions, 293 deletions
diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index 9307f7da4..1c48b6280 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1549373905, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0", "changes": [ { diff --git a/contracts/asset-proxy/CHANGELOG.md b/contracts/asset-proxy/CHANGELOG.md index 779eb68a7..9600ae19a 100644 --- a/contracts/asset-proxy/CHANGELOG.md +++ b/contracts/asset-proxy/CHANGELOG.md @@ -5,24 +5,18 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v2.2.3 - _January 17, 2019_ +## v1.0.3 - _February 7, 2019_ - * Dependencies updated + * Fake publish to enable pinning -## v2.2.2 - _January 15, 2019_ +## v1.0.2 - _February 6, 2019_ * Dependencies updated -## v2.2.1 - _January 11, 2019_ +## v1.0.1 - _February 5, 2019_ * Dependencies updated -## v2.2.0 - _January 9, 2019_ - - * Added LibAddressArray (#1383) - * Add validation and comments to MultiAssetProxy (#1455) - * Move OrderValidator to extensions (#1464) +## v1.0.0 - _Invalid date_ -## v2.1.59 - _December 13, 2018_ - - * Dependencies updated + * Move all AssetProxy contracts out of contracts-protocol to new package (#1539) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index ce686b7ef..88ae7e3a5 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-asset-proxy", - "version": "1.0.0", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -66,17 +66,17 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/contracts-erc20": "1.0.0", - "@0x/contracts-erc721": "1.0.0", - "@0x/contracts-utils": "3.0.0", - "@0x/order-utils": "^3.1.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 93f284234..352013d26 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1549373905, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0", "changes": [ { diff --git a/contracts/erc20/CHANGELOG.md b/contracts/erc20/CHANGELOG.md index 59d0804da..9f4bdb99e 100644 --- a/contracts/erc20/CHANGELOG.md +++ b/contracts/erc20/CHANGELOG.md @@ -5,22 +5,18 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v1.0.6 - _January 17, 2019_ +## v1.0.3 - _February 7, 2019_ - * Dependencies updated + * Fake publish to enable pinning -## v1.0.5 - _January 15, 2019_ +## v1.0.2 - _February 6, 2019_ * Dependencies updated -## v1.0.4 - _January 11, 2019_ +## v1.0.1 - _February 5, 2019_ * Dependencies updated -## v1.0.3 - _January 9, 2019_ - - * Dependencies updated +## v1.0.0 - _Invalid date_ -## v1.0.2 - _December 13, 2018_ - - * Dependencies updated + * Move all ERC20 contracts out of contracts-tokens to new package (#1539) diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 801f2a034..082395376 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc20", - "version": "1.0.0", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -46,12 +46,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -67,14 +67,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-exchange-libs": "1.0.0", - "@0x/contracts-utils": "3.0.0", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-utils": "^2.0.2", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index caf1e6701..8a8027f36 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1549373905, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0", "changes": [ { diff --git a/contracts/erc721/CHANGELOG.md b/contracts/erc721/CHANGELOG.md index 59d0804da..2fbf8fe7e 100644 --- a/contracts/erc721/CHANGELOG.md +++ b/contracts/erc721/CHANGELOG.md @@ -5,22 +5,18 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v1.0.6 - _January 17, 2019_ +## v1.0.3 - _February 7, 2019_ - * Dependencies updated + * Fake publish to enable pinning -## v1.0.5 - _January 15, 2019_ +## v1.0.2 - _February 6, 2019_ * Dependencies updated -## v1.0.4 - _January 11, 2019_ +## v1.0.1 - _February 5, 2019_ * Dependencies updated -## v1.0.3 - _January 9, 2019_ - - * Dependencies updated +## v1.0.0 - _Invalid date_ -## v1.0.2 - _December 13, 2018_ - - * Dependencies updated + * Move all ERC721 contracts out of contracts-tokens to new package (#1539) diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 54f261a80..3989830a9 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc721", - "version": "1.0.0", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -46,12 +46,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -67,13 +67,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-utils": "3.0.0", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-utils": "^2.0.2", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index a9e5fa8da..44b812513 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1549373905, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0", "changes": [ { diff --git a/contracts/exchange-forwarder/CHANGELOG.md b/contracts/exchange-forwarder/CHANGELOG.md index 94ffdfb67..dde8d8087 100644 --- a/contracts/exchange-forwarder/CHANGELOG.md +++ b/contracts/exchange-forwarder/CHANGELOG.md @@ -5,28 +5,18 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v1.2.3 - _January 17, 2019_ +## v1.0.3 - _February 7, 2019_ - * Dependencies updated + * Fake publish to enable pinning -## v1.2.2 - _January 15, 2019_ +## v1.0.2 - _February 6, 2019_ * Dependencies updated -## v1.2.1 - _January 11, 2019_ +## v1.0.1 - _February 5, 2019_ * Dependencies updated -## v1.2.0 - _January 9, 2019_ - - * Added Dutch Auction Wrapper (#1465) - -## v1.1.0 - _Invalid date_ +## v1.0.0 - _Invalid date_ - * Added Balance Threshold Filter (#1383) - * Add OrderMatcher (#1117) - * Add OrderValidator (#1464) - -## v1.0.2 - _December 13, 2018_ - - * Dependencies updated + * Move Forwarder contract out of contracts-extensions into new package (#1539) diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 388980177..511d749f7 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-forwarder", - "version": "1.0.0", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -46,13 +46,13 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contract-wrappers": "^5.0.1", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contract-wrappers": "^7.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -68,19 +68,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-asset-proxy": "1.0.0", - "@0x/contracts-exchange-libs": "1.0.0", - "@0x/contracts-exchange": "1.0.0", - "@0x/contracts-erc20": "1.0.0", - "@0x/contracts-erc721": "1.0.0", - "@0x/contracts-utils": "3.0.0", - "@0x/order-utils": "^3.1.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-exchange": "^1.0.3", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index cdaac93ea..6a169e635 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1549373905, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0", "changes": [ { diff --git a/contracts/exchange-libs/CHANGELOG.md b/contracts/exchange-libs/CHANGELOG.md index 59d0804da..0bd4a7b70 100644 --- a/contracts/exchange-libs/CHANGELOG.md +++ b/contracts/exchange-libs/CHANGELOG.md @@ -5,22 +5,19 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v1.0.6 - _January 17, 2019_ +## v1.0.3 - _February 7, 2019_ - * Dependencies updated + * Fake publish to enable pinning -## v1.0.5 - _January 15, 2019_ +## v1.0.2 - _February 6, 2019_ * Dependencies updated -## v1.0.4 - _January 11, 2019_ +## v1.0.1 - _February 5, 2019_ * Dependencies updated -## v1.0.3 - _January 9, 2019_ - - * Dependencies updated +## v1.0.0 - _Invalid date_ -## v1.0.2 - _December 13, 2018_ - - * Dependencies updated + * Rename contracts-libs to contracts-exchange-libs (#1539) + * Move LibAddressArray contract to contracts-utils (#1539) diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index a2279af91..8b50ca3f6 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-libs", - "version": "1.0.0", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -46,12 +46,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -67,14 +67,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-utils": "3.0.0", - "@0x/order-utils": "^3.1.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index e4c7aa986..7b640dafe 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1549373905, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0", "changes": [ { diff --git a/contracts/exchange/CHANGELOG.md b/contracts/exchange/CHANGELOG.md index 779eb68a7..7a30bfea9 100644 --- a/contracts/exchange/CHANGELOG.md +++ b/contracts/exchange/CHANGELOG.md @@ -5,24 +5,19 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v2.2.3 - _January 17, 2019_ +## v1.0.3 - _February 7, 2019_ - * Dependencies updated + * Fake publish to enable pinning -## v2.2.2 - _January 15, 2019_ +## v1.0.2 - _February 6, 2019_ * Dependencies updated -## v2.2.1 - _January 11, 2019_ +## v1.0.1 - _February 5, 2019_ * Dependencies updated -## v2.2.0 - _January 9, 2019_ - - * Added LibAddressArray (#1383) - * Add validation and comments to MultiAssetProxy (#1455) - * Move OrderValidator to extensions (#1464) +## v1.0.0 - _Invalid date_ -## v2.1.59 - _December 13, 2018_ - - * Dependencies updated + * Move Exchange contract out of contracts-protocol to new package (#1539) + * Move example contracts out of contracts-examples to new package (#1539) diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 51a6cdf26..021ae219a 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange", - "version": "1.0.0", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -66,19 +66,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-asset-proxy": "1.0.0", - "@0x/contracts-exchange-libs": "1.0.0", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/contracts-erc20": "1.0.0", - "@0x/contracts-erc721": "1.0.0", - "@0x/contracts-utils": "3.0.0", - "@0x/order-utils": "^3.1.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.5" }, diff --git a/contracts/exchange/test/transactions.ts b/contracts/exchange/test/transactions.ts index 613953493..4f8c07579 100644 --- a/contracts/exchange/test/transactions.ts +++ b/contracts/exchange/test/transactions.ts @@ -8,14 +8,13 @@ import { OrderFactory, orderUtils, provider, - SignedTransaction, TransactionFactory, txDefaults, web3Wrapper, } from '@0x/contracts-test-utils'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils'; -import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types'; +import { OrderWithoutExchangeAddress, RevertReason, SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; @@ -41,7 +40,7 @@ describe('Exchange transactions', () => { let erc20Balances: ERC20BalancesByOwner; let signedOrder: SignedOrder; - let signedTx: SignedTransaction; + let signedTx: SignedZeroExTransaction; let orderWithoutExchangeAddress: OrderWithoutExchangeAddress; let orderFactory: OrderFactory; let makerTransactionFactory: TransactionFactory; diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts index 61176751f..535e3bcf2 100644 --- a/contracts/exchange/test/utils/exchange_wrapper.ts +++ b/contracts/exchange/test/utils/exchange_wrapper.ts @@ -1,12 +1,5 @@ -import { - FillResults, - formatters, - LogDecoder, - OrderInfo, - orderUtils, - SignedTransaction, -} from '@0x/contracts-test-utils'; -import { SignedOrder } from '@0x/types'; +import { FillResults, formatters, LogDecoder, OrderInfo, orderUtils } from '@0x/contracts-test-utils'; +import { SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { AbiEncoder, BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; @@ -204,7 +197,7 @@ export class ExchangeWrapper { return tx; } public async executeTransactionAsync( - signedTx: SignedTransaction, + signedTx: SignedZeroExTransaction, from: string, ): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await this._exchange.executeTransaction.sendTransactionAsync( diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 16ec073aa..4d9955408 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,14 +1,19 @@ [ { - "version": "3.0.0", + "version": "2.0.2", "changes": [ { - "note": "Move Forwarder contract into new package", - "pr": 1539 - }, + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ { - "note": "Nest extensions under src directory", - "pr": 1539 + "note": "Dependencies updated" } ] }, @@ -18,8 +23,17 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Move Forwarder contract into new package", + "pr": 1539 + }, + { + "note": "Nest extensions under src directory", + "pr": 1539 } - ] + ], + "timestamp": 1549373905 }, { "timestamp": 1547747677, diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md index 94ffdfb67..fe80e1ddc 100644 --- a/contracts/extensions/CHANGELOG.md +++ b/contracts/extensions/CHANGELOG.md @@ -5,6 +5,20 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + +## v2.0.0 - _February 5, 2019_ + + * Upgrade the bignumber.js to v8.0.2 (#1517) + * Move Forwarder contract into new package (#1539) + * Nest extensions under src directory (#1539) + ## v1.2.3 - _January 17, 2019_ * Dependencies updated diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 698c42ccf..34b994f02 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-extensions", - "version": "1.2.3", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -46,13 +46,13 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contract-wrappers": "^5.0.1", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contract-wrappers": "^7.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -68,19 +68,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-asset-proxy": "1.0.0", - "@0x/contracts-exchange-libs": "1.0.0", - "@0x/contracts-exchange": "1.0.0", - "@0x/contracts-erc20": "1.0.0", - "@0x/contracts-erc721": "1.0.0", - "@0x/contracts-utils": "3.0.0", - "@0x/order-utils": "^3.1.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-exchange": "^1.0.3", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index 0fd8833c9..6fbe3712a 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,14 +1,19 @@ [ { - "version": "3.0.0", + "version": "2.0.2", "changes": [ { - "note": "Add AssetProxyOwner contract", - "pr": 1539 - }, + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ { - "note": "Rename multisig directory to src", - "pr": 1539 + "note": "Dependencies updated" } ] }, @@ -18,8 +23,17 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Add AssetProxyOwner contract", + "pr": 1539 + }, + { + "note": "Rename multisig directory to src", + "pr": 1539 } - ] + ], + "timestamp": 1549373905 }, { "timestamp": 1547747677, diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md index 59d0804da..7426c18c3 100644 --- a/contracts/multisig/CHANGELOG.md +++ b/contracts/multisig/CHANGELOG.md @@ -5,6 +5,20 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + +## v2.0.0 - _February 5, 2019_ + + * Upgrade the bignumber.js to v8.0.2 (#1517) + * Add AssetProxyOwner contract (#1539) + * Rename multisig directory to src (#1539) + ## v1.0.6 - _January 17, 2019_ * Dependencies updated diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index c5cc8ef25..d6e5989cd 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-multisig", - "version": "1.0.6", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -46,12 +46,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", @@ -67,14 +67,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/contracts-asset-proxy": "1.0.0", - "@0x/contracts-erc20": "1.0.0", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", - "ethereum-types": "^1.1.6", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", + "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index ae1575e43..b789f2907 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,12 +1,35 @@ [ { + "version": "3.0.2", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ], + "timestamp": 1549504360 + }, + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "3.0.0", "changes": [ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Import `ZeroExTransaction` type instead of using type defined in this package", + "pr": 1576 } - ] + ], + "timestamp": 1549373905 }, { "timestamp": 1547747677, diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md index 2ed0524a6..222a6a93d 100644 --- a/contracts/test-utils/CHANGELOG.md +++ b/contracts/test-utils/CHANGELOG.md @@ -5,6 +5,19 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + +## v3.0.0 - _February 5, 2019_ + + * Upgrade the bignumber.js to v8.0.2 (#1517) + * Import `ZeroExTransaction` type instead of using type defined in this package (#1576) + ## v2.0.1 - _January 17, 2019_ * Dependencies updated diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index 262b8c7cd..0b8478e05 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-test-utils", - "version": "2.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -40,19 +40,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/dev-utils": "^1.0.24", - "@0x/order-utils": "^3.1.2", - "@0x/sol-compiler": "^2.0.2", - "@0x/sol-coverage": "^1.0.3", - "@0x/sol-profiler": "^1.0.3", - "@0x/sol-trace": "^1.0.3", - "@0x/subproviders": "^2.1.11", - "@0x/tslint-config": "^2.0.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", + "@0x/abi-gen": "^2.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/order-utils": "^6.0.0", + "@0x/sol-compiler": "^3.0.1", + "@0x/sol-coverage": "^2.0.1", + "@0x/sol-profiler": "^2.0.2", + "@0x/sol-trace": "^2.0.2", + "@0x/subproviders": "^3.0.1", + "@0x/tslint-config": "^3.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/bn.js": "^4.11.0", "@types/js-combinatorics": "^0.5.29", "@types/lodash": "4.14.104", @@ -62,7 +62,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereum-types": "^1.1.6", + "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", "js-combinatorics": "^0.5.3", diff --git a/contracts/test-utils/src/index.ts b/contracts/test-utils/src/index.ts index 7880de0bf..5ac927e47 100644 --- a/contracts/test-utils/src/index.ts +++ b/contracts/test-utils/src/index.ts @@ -31,7 +31,6 @@ export { MarketBuyOrders, MarketSellOrders, ERC721TokenIdsByOwner, - SignedTransaction, OrderStatus, AllowanceAmountScenario, AssetDataScenario, diff --git a/contracts/test-utils/src/transaction_factory.ts b/contracts/test-utils/src/transaction_factory.ts index dbab3ade4..e6cd4c23f 100644 --- a/contracts/test-utils/src/transaction_factory.ts +++ b/contracts/test-utils/src/transaction_factory.ts @@ -1,10 +1,8 @@ -import { eip712Utils, generatePseudoRandomSalt } from '@0x/order-utils'; -import { SignatureType } from '@0x/types'; -import { signTypedDataUtils } from '@0x/utils'; +import { generatePseudoRandomSalt, transactionHashUtils } from '@0x/order-utils'; +import { SignatureType, SignedZeroExTransaction } from '@0x/types'; import * as ethUtil from 'ethereumjs-util'; import { signingUtils } from './signing_utils'; -import { SignedTransaction } from './types'; export class TransactionFactory { private readonly _signerBuff: Buffer; @@ -15,23 +13,25 @@ export class TransactionFactory { this._exchangeAddress = exchangeAddress; this._signerBuff = ethUtil.privateToAddress(this._privateKey); } - public newSignedTransaction(data: string, signatureType: SignatureType = SignatureType.EthSign): SignedTransaction { + public newSignedTransaction( + data: string, + signatureType: SignatureType = SignatureType.EthSign, + ): SignedZeroExTransaction { const salt = generatePseudoRandomSalt(); const signerAddress = `0x${this._signerBuff.toString('hex')}`; - const executeTransactionData = { + const transaction = { salt, signerAddress, data, + verifyingContractAddress: this._exchangeAddress, }; - const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData, this._exchangeAddress); - const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData); - const signature = signingUtils.signMessage(eip712MessageBuffer, this._privateKey, signatureType); - const signedTx = { - exchangeAddress: this._exchangeAddress, + const transactionHashBuffer = transactionHashUtils.getTransactionHashBuffer(transaction); + const signature = signingUtils.signMessage(transactionHashBuffer, this._privateKey, signatureType); + const signedTransaction = { + ...transaction, signature: `0x${signature.toString('hex')}`, - ...executeTransactionData, }; - return signedTx; + return signedTransaction; } } diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts index 60cb2b102..16c3a9f3d 100644 --- a/contracts/test-utils/src/types.ts +++ b/contracts/test-utils/src/types.ts @@ -107,14 +107,6 @@ export enum ContractName { BalanceThresholdFilter = 'BalanceThresholdFilter', } -export interface SignedTransaction { - exchangeAddress: string; - salt: BigNumber; - signerAddress: string; - data: string; - signature: string; -} - export interface TransferAmountsByMatchOrders { // Left Maker amountBoughtByLeftMaker: BigNumber; diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 94434b803..7c90d8e7e 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,27 +1,19 @@ [ { - "version": "3.0.0", + "version": "2.0.2", "changes": [ { - "note": "Add LibAddressArray contract", - "pr": 1539 - }, - { - "note": "Do not nest contracts in redundant directories", - "pr": 1539 - }, - { - "note": "Rename utils directory to src", - "pr": 1539 + "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { + "timestamp": 1549452781, "version": "2.0.1", "changes": [ { - "note": "Fix imports in `TestConstants` and `TestLibBytes` to be relative. This way they show up correctly in coverage reports", - "pr": 1535 + "note": "Dependencies updated" } ] }, @@ -31,8 +23,25 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Fix imports in `TestConstants` and `TestLibBytes` to be relative. This way they show up correctly in coverage reports", + "pr": 1535 + }, + { + "note": "Add LibAddressArray contract", + "pr": 1539 + }, + { + "note": "Do not nest contracts in redundant directories", + "pr": 1539 + }, + { + "note": "Rename utils directory to src", + "pr": 1539 } - ] + ], + "timestamp": 1549373905 }, { "timestamp": 1547747677, diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md index 59d0804da..e11d1d9c5 100644 --- a/contracts/utils/CHANGELOG.md +++ b/contracts/utils/CHANGELOG.md @@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + +## v2.0.0 - _February 5, 2019_ + + * Upgrade the bignumber.js to v8.0.2 (#1517) + * Fix imports in `TestConstants` and `TestLibBytes` to be relative. This way they show up correctly in coverage reports (#1535) + * Add LibAddressArray contract (#1539) + * Do not nest contracts in redundant directories (#1539) + * Rename utils directory to src (#1539) + ## v1.0.6 - _January 17, 2019_ * Dependencies updated diff --git a/contracts/utils/package.json b/contracts/utils/package.json index afa4a7011..9b66f532e 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-utils", - "version": "3.0.0", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -46,15 +46,15 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.22", - "@0x/contracts-test-utils": "^2.0.1", - "@0x/dev-utils": "^1.0.24", - "@0x/sol-compiler": "^2.0.2", - "@0x/tslint-config": "^2.0.2", "@0x/contracts-gen": "^1.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/tslint-config": "^3.0.0", + "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "@types/node": "*", - "@types/bn.js": "^4.11.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", @@ -68,14 +68,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^3.0.13", - "@0x/order-utils": "^3.1.2", - "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", + "@0x/base-contract": "^4.0.1", + "@0x/order-utils": "^6.0.0", + "@0x/types": "^2.0.1", + "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "bn.js": "^4.11.8", - "ethereum-types": "^1.1.6", + "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.5" }, |