diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-07-25 07:02:21 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-07-25 07:02:21 +0800 |
commit | 9c81692d48fed4942fe6482949d6eed3629d4037 (patch) | |
tree | aefc2a71dcfce2589c1e8505e6b64f2e6c9a9dfe /packages/order-utils/src | |
parent | c505ba6f3e05f4bb415f50352fbb124fec3a71ad (diff) | |
parent | fac90c446cc3a79ffe57ae13c685e7555714cf23 (diff) | |
download | dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.gz dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.bz2 dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.lz dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.xz dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.zst dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.zip |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/upgrade-allowance-toggles-to-locks-and-checks
Diffstat (limited to 'packages/order-utils/src')
-rw-r--r-- | packages/order-utils/src/asset_data_utils.ts | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/packages/order-utils/src/asset_data_utils.ts b/packages/order-utils/src/asset_data_utils.ts index a9601e9ea..0c0b59548 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,11 @@ export const assetDataUtils = { }), but got ${assetProxyId}`, ); } - const [tokenAddress, tokenId, receiverData] = ethAbi.rawDecode( - ['address', 'uint256', 'bytes'], - data.slice(constants.SELECTOR_LENGTH), - ); + 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), }; }, /** |