diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-07-23 07:14:09 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-23 07:14:09 +0800 |
commit | 195d11f9d0bef49494b05198c259c7314cc9097d (patch) | |
tree | 7ff0ad80b4d5b84c365b4a8a12c321098ca4860c /packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol | |
parent | 06f61949f93eb83ea7d6456f6bbf18cb6f6dab7a (diff) | |
parent | 9aa49e59d0b4a29fb9943fe2dcc04fd2630041b9 (diff) | |
download | dexon-0x-contracts-195d11f9d0bef49494b05198c259c7314cc9097d.tar.gz dexon-0x-contracts-195d11f9d0bef49494b05198c259c7314cc9097d.tar.zst dexon-0x-contracts-195d11f9d0bef49494b05198c259c7314cc9097d.zip |
Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback
Removed receiverData and `onReceive` callback from ERC721 proxy.
Diffstat (limited to 'packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol b/packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol index 6c49330f2..bebfc976b 100644 --- a/packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol +++ b/packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol @@ -109,12 +109,10 @@ contract MixinTransfer is // Decode asset data. address token = assetData.readAddress(16); uint256 tokenId = assetData.readUint256(36); - bytes memory receiverData = assetData.readBytesWithLength(100); - IERC721Token(token).safeTransferFrom( + IERC721Token(token).transferFrom( address(this), to, - tokenId, - receiverData + tokenId ); } } |