From e1a9f3435f2527fcf38e68c5749bfddf1ba3b37d Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 16 Jul 2018 17:11:14 +0200 Subject: Removed receiverData from ERC721 Proxy Id generation --- packages/order-utils/src/asset_data_utils.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/src/asset_data_utils.ts b/packages/order-utils/src/asset_data_utils.ts index cb02d7d42..2b6d44227 100644 --- a/packages/order-utils/src/asset_data_utils.ts +++ b/packages/order-utils/src/asset_data_utils.ts @@ -50,14 +50,13 @@ export const assetDataUtils = { * @param tokenId The ERC721 tokenId to encode * @return The hex encoded assetData string */ - encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber, receiverData?: string): string { + encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber): string { // TODO: Pass `tokendId` as a BigNumber. return ethUtil.bufferToHex( ethAbi.simpleEncode( - 'ERC721Token(address,uint256,bytes)', + 'ERC721Token(address,uint256)', tokenAddress, `0x${tokenId.toString(constants.BASE_16)}`, - ethUtil.toBuffer(receiverData || '0x'), ), ); }, @@ -83,15 +82,14 @@ export const assetDataUtils = { }), but got ${assetProxyId}`, ); } - const [tokenAddress, tokenId, receiverData] = ethAbi.rawDecode( - ['address', 'uint256', 'bytes'], + const [tokenAddress, tokenId] = ethAbi.rawDecode( + ['address', 'uint256'], data.slice(constants.SELECTOR_LENGTH), ); return { assetProxyId, tokenAddress: ethUtil.addHexPrefix(tokenAddress), tokenId: new BigNumber(tokenId.toString()), - receiverData: ethUtil.bufferToHex(receiverData), }; }, /** -- cgit v1.2.3 From 36c27bdbf86d42fe2de417070de1368966ea66ad Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 17 Jul 2018 00:51:59 +0200 Subject: Ran prettier --- packages/order-utils/src/asset_data_utils.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/src/asset_data_utils.ts b/packages/order-utils/src/asset_data_utils.ts index 2b6d44227..d39c3c774 100644 --- a/packages/order-utils/src/asset_data_utils.ts +++ b/packages/order-utils/src/asset_data_utils.ts @@ -82,10 +82,7 @@ export const assetDataUtils = { }), but got ${assetProxyId}`, ); } - const [tokenAddress, tokenId] = ethAbi.rawDecode( - ['address', 'uint256'], - data.slice(constants.SELECTOR_LENGTH), - ); + const [tokenAddress, tokenId] = ethAbi.rawDecode(['address', 'uint256'], data.slice(constants.SELECTOR_LENGTH)); return { assetProxyId, tokenAddress: ethUtil.addHexPrefix(tokenAddress), -- cgit v1.2.3 From dc151f7290072c9776c9b351ae30bf577fcd1015 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 20 Jul 2018 20:13:53 +0200 Subject: Add missing timestamp to CHANGELOG entries --- packages/order-utils/CHANGELOG.json | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 5d92cb318..d74ba90ea 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { -- cgit v1.2.3 From b466431ede101054bd6a8133b4733273a0034d46 Mon Sep 17 00:00:00 2001 From: Luke Autry Date: Sat, 21 Jul 2018 18:05:33 -0400 Subject: fix decodeAssetData for addresses starting in 0 --- packages/order-utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index b87ae5223..179b821e3 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -82,7 +82,7 @@ "@types/node": "^8.0.53", "bn.js": "^4.11.8", "ethereum-types": "^1.0.0", - "ethereumjs-abi": "^0.6.4", + "ethereumjs-abi": "^0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "lodash": "^4.17.4" -- cgit v1.2.3 From b987eebf215391a8af9cff995c7f6c4a6e434bd9 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 22 Jul 2018 07:37:12 +0200 Subject: Fix version of ethereumjs-abi to 0.6.5 to fix decoding bug --- packages/order-utils/CHANGELOG.json | 9 +++++++++ packages/order-utils/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index d74ba90ea..b1f962e9f 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.0-rc.2", + "changes": [ + { + "note": + "Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`" + } + ] + }, { "timestamp": 1532043000, "version": "1.0.0-rc.1", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 179b821e3..0df8a3f6c 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -82,7 +82,7 @@ "@types/node": "^8.0.53", "bn.js": "^4.11.8", "ethereum-types": "^1.0.0", - "ethereumjs-abi": "^0.6.5", + "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "lodash": "^4.17.4" -- cgit v1.2.3 From 855b6b1dc5597f360451232ff6dfc91beb3a9f50 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 23 Jul 2018 16:58:40 +0200 Subject: Updated CHANGELOGS --- packages/order-utils/CHANGELOG.json | 3 ++- packages/order-utils/CHANGELOG.md | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index b1f962e9f..8d689b3da 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -6,7 +6,8 @@ "note": "Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`" } - ] + ], + "timestamp": 1532357734 }, { "timestamp": 1532043000, diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index 17464a966..c8d1093e8 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -1,10 +1,20 @@ CHANGELOG +## v1.0.0-rc.2 - _July 23, 2018_ + + * Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData` + +## v1.0.0-rc.1 - _July 20, 2018_ + + * Refactor to work with V2 of 0x protocol (#636) + * Export parseECSignature method (#684) + * Handle Typed Arrays when hashing data (#894) + ## v0.0.9 - _July 18, 2018_ * Dependencies updated -- cgit v1.2.3 From f05a5638027fb0d88389867007ab15b137338b54 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 23 Jul 2018 16:58:52 +0200 Subject: Publish - 0x.js@1.0.0 - @0xproject/abi-gen@1.0.1 - @0xproject/assert@1.0.1 - @0xproject/base-contract@1.0.1 - @0xproject/connect@1.0.1 - @0xproject/contract-wrappers@1.0.0 - contracts@2.1.36 - @0xproject/dev-utils@1.0.1 - ethereum-types@1.0.1 - @0xproject/fill-scenarios@1.0.0 - @0xproject/json-schemas@1.0.0 - @0xproject/metacoin@0.0.11 - @0xproject/migrations@1.0.1 - @0xproject/monorepo-scripts@1.0.1 - @0xproject/order-utils@1.0.0 - @0xproject/order-watcher@1.0.0 - @0xproject/react-docs@1.0.1 - @0xproject/react-docs-example@0.0.16 - @0xproject/react-shared@1.0.1 - @0xproject/sol-compiler@1.0.1 - @0xproject/sol-cov@1.0.1 - @0xproject/sol-resolver@1.0.1 - @0xproject/sra-report@1.0.1 - @0xproject/subproviders@1.0.1 - @0xproject/testnet-faucets@1.0.37 - @0xproject/tslint-config@1.0.1 - @0xproject/types@1.0.0 - @0xproject/typescript-typings@1.0.1 - @0xproject/utils@1.0.1 - @0xproject/web3-wrapper@1.0.1 - @0xproject/website@0.0.40 --- packages/order-utils/package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 0df8a3f6c..34d14b00f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/order-utils", - "version": "1.0.0-rc.1", + "version": "1.0.0", "engines": { "node": ">=6.12" }, @@ -51,9 +51,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0xproject/dev-utils": "^1.0.0", - "@0xproject/monorepo-scripts": "^1.0.0", - "@0xproject/tslint-config": "^1.0.0", + "@0xproject/dev-utils": "^1.0.1", + "@0xproject/monorepo-scripts": "^1.0.1", + "@0xproject/tslint-config": "^1.0.1", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", @@ -71,17 +71,17 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^1.0.0", - "@0xproject/base-contract": "^1.0.0", - "@0xproject/json-schemas": "^1.0.0-rc.1", - "@0xproject/sol-compiler": "^1.0.0", - "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^1.0.0", + "@0xproject/assert": "^1.0.1", + "@0xproject/base-contract": "^1.0.1", + "@0xproject/json-schemas": "^1.0.0", + "@0xproject/sol-compiler": "^1.0.1", + "@0xproject/types": "^1.0.0", + "@0xproject/typescript-typings": "^1.0.1", + "@0xproject/utils": "^1.0.1", + "@0xproject/web3-wrapper": "^1.0.1", "@types/node": "^8.0.53", "bn.js": "^4.11.8", - "ethereum-types": "^1.0.0", + "ethereum-types": "^1.0.1", "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", -- cgit v1.2.3 From a66ccaa1da2af753038bf22a5e7e63bdc307bf2f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 23 Jul 2018 17:13:31 +0200 Subject: Revert "Publish" This reverts commit 3dc94051713e4a32796ce3b4ae4b70b527e24cfe. --- packages/order-utils/package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 34d14b00f..0df8a3f6c 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/order-utils", - "version": "1.0.0", + "version": "1.0.0-rc.1", "engines": { "node": ">=6.12" }, @@ -51,9 +51,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0xproject/dev-utils": "^1.0.1", - "@0xproject/monorepo-scripts": "^1.0.1", - "@0xproject/tslint-config": "^1.0.1", + "@0xproject/dev-utils": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", + "@0xproject/tslint-config": "^1.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", @@ -71,17 +71,17 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^1.0.1", - "@0xproject/base-contract": "^1.0.1", - "@0xproject/json-schemas": "^1.0.0", - "@0xproject/sol-compiler": "^1.0.1", - "@0xproject/types": "^1.0.0", - "@0xproject/typescript-typings": "^1.0.1", - "@0xproject/utils": "^1.0.1", - "@0xproject/web3-wrapper": "^1.0.1", + "@0xproject/assert": "^1.0.0", + "@0xproject/base-contract": "^1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", + "@0xproject/sol-compiler": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", + "@0xproject/typescript-typings": "^1.0.0", + "@0xproject/utils": "^1.0.0", + "@0xproject/web3-wrapper": "^1.0.0", "@types/node": "^8.0.53", "bn.js": "^4.11.8", - "ethereum-types": "^1.0.1", + "ethereum-types": "^1.0.0", "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", -- cgit v1.2.3 From 3af2ef84390fef96f0af60912cae055ddffe953a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 23 Jul 2018 19:11:48 +0200 Subject: Revert "Revert "Publish"" This reverts commit a66ccaa1da2af753038bf22a5e7e63bdc307bf2f. --- packages/order-utils/package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 0df8a3f6c..34d14b00f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/order-utils", - "version": "1.0.0-rc.1", + "version": "1.0.0", "engines": { "node": ">=6.12" }, @@ -51,9 +51,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0xproject/dev-utils": "^1.0.0", - "@0xproject/monorepo-scripts": "^1.0.0", - "@0xproject/tslint-config": "^1.0.0", + "@0xproject/dev-utils": "^1.0.1", + "@0xproject/monorepo-scripts": "^1.0.1", + "@0xproject/tslint-config": "^1.0.1", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", @@ -71,17 +71,17 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^1.0.0", - "@0xproject/base-contract": "^1.0.0", - "@0xproject/json-schemas": "^1.0.0-rc.1", - "@0xproject/sol-compiler": "^1.0.0", - "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^1.0.0", + "@0xproject/assert": "^1.0.1", + "@0xproject/base-contract": "^1.0.1", + "@0xproject/json-schemas": "^1.0.0", + "@0xproject/sol-compiler": "^1.0.1", + "@0xproject/types": "^1.0.0", + "@0xproject/typescript-typings": "^1.0.1", + "@0xproject/utils": "^1.0.1", + "@0xproject/web3-wrapper": "^1.0.1", "@types/node": "^8.0.53", "bn.js": "^4.11.8", - "ethereum-types": "^1.0.0", + "ethereum-types": "^1.0.1", "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", -- cgit v1.2.3 From 24b5aa0e8214f51d5e01b21aae57713aaf4ae382 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 23 Jul 2018 19:18:09 +0200 Subject: Add new RC versions to changelog so that these packages are publised as RC's --- packages/order-utils/CHANGELOG.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 8d689b3da..443f8c77e 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,4 +1,21 @@ [ + { + "version": "1.0.1-rc.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ], + "timestamp": 1532357734 + }, { "version": "1.0.0-rc.2", "changes": [ -- cgit v1.2.3 From 97268d22534c2f4aca9bd6a88c70e988969d3c76 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 16:33:16 +0200 Subject: Temporarily add changelog & package.json version changes --- packages/order-utils/CHANGELOG.json | 3 ++- packages/order-utils/CHANGELOG.md | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 443f8c77e..0f47d68c8 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1532442671 }, { "version": "1.0.0", diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index c8d1093e8..a6e120e07 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.1-rc.1 - _July 24, 2018_ + + * Dependencies updated + +## v1.0.0 - _July 23, 2018_ + + * Dependencies updated + ## v1.0.0-rc.2 - _July 23, 2018_ * Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData` -- cgit v1.2.3 From 91c7105d434287628654795fd92834aa4edb69b4 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 25 Jul 2018 11:48:01 +0200 Subject: Revert "Temporarily add changelog & package.json version changes" This reverts commit 97268d22534c2f4aca9bd6a88c70e988969d3c76. --- packages/order-utils/CHANGELOG.json | 3 +-- packages/order-utils/CHANGELOG.md | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 0f47d68c8..443f8c77e 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -5,8 +5,7 @@ { "note": "Dependencies updated" } - ], - "timestamp": 1532442671 + ] }, { "version": "1.0.0", diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index a6e120e07..c8d1093e8 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,14 +5,6 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v1.0.1-rc.1 - _July 24, 2018_ - - * Dependencies updated - -## v1.0.0 - _July 23, 2018_ - - * Dependencies updated - ## v1.0.0-rc.2 - _July 23, 2018_ * Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData` -- cgit v1.2.3