diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-07-23 22:34:08 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-07-23 23:02:51 +0800 |
commit | 06396b8874f2cff1333d3f19c536015502f69d28 (patch) | |
tree | 0197338c16c6e990613c7cb390ca038286ca10ee /packages/contracts/src/2.0.0 | |
parent | e5e68de2d7bf8bfc319200b8dc9f27cf8a081b4a (diff) | |
download | dexon-sol-tools-06396b8874f2cff1333d3f19c536015502f69d28.tar.gz dexon-sol-tools-06396b8874f2cff1333d3f19c536015502f69d28.tar.zst dexon-sol-tools-06396b8874f2cff1333d3f19c536015502f69d28.zip |
Remove ERC721 callback functions
Diffstat (limited to 'packages/contracts/src/2.0.0')
4 files changed, 3 insertions, 49 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol b/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol index 084a28550..5cf5f831b 100644 --- a/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol +++ b/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol @@ -35,8 +35,6 @@ contract MixinAssets is using LibBytes for bytes; bytes4 constant internal ERC20_TRANSFER_SELECTOR = bytes4(keccak256("transfer(address,uint256)")); - bytes4 constant internal ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,uint256,bytes)")); - bytes4 constant internal ERC721_RECEIVED_OPERATOR = bytes4(keccak256("onERC721Received(address,address,uint256,bytes)")); /// @dev Withdraws ERC20 tokens from this contract. The contract requires a ZRX balance in order to /// function optimally, and this function allows the ZRX to be withdrawn by owner. It may also be @@ -56,31 +54,6 @@ contract MixinAssets is ); } - function onERC721Received( - address, - uint256, - bytes memory - ) - public - pure - returns(bytes4) - { - return ERC721_RECEIVED; - } - - function onERC721Received( - address, - address, - uint256, - bytes memory - ) - public - pure - returns(bytes4) - { - return ERC721_RECEIVED_OPERATOR; - } - /// @dev Transfers given amount of asset to sender. /// @param assetData Byte array encoded for the respective asset proxy. /// @param amount Amount of asset to transfer to sender. diff --git a/packages/contracts/src/2.0.0/forwarder/MixinExchangeWrapper.sol b/packages/contracts/src/2.0.0/forwarder/MixinExchangeWrapper.sol index e150791da..f3aa483c5 100644 --- a/packages/contracts/src/2.0.0/forwarder/MixinExchangeWrapper.sol +++ b/packages/contracts/src/2.0.0/forwarder/MixinExchangeWrapper.sol @@ -250,4 +250,4 @@ contract MixinExchangeWrapper is return totalFillResults; } -}
\ No newline at end of file +} diff --git a/packages/contracts/src/2.0.0/forwarder/interfaces/IAssets.sol b/packages/contracts/src/2.0.0/forwarder/interfaces/IAssets.sol index 27adb1221..9b0d995eb 100644 --- a/packages/contracts/src/2.0.0/forwarder/interfaces/IAssets.sol +++ b/packages/contracts/src/2.0.0/forwarder/interfaces/IAssets.sol @@ -31,23 +31,4 @@ contract IAssets { uint256 amount ) external; - - function onERC721Received( - address, - uint256, - bytes memory - ) - public - pure - returns(bytes4); - - function onERC721Received( - address, - address, - uint256, - bytes memory - ) - public - pure - returns(bytes4); -}
\ No newline at end of file +} diff --git a/packages/contracts/src/2.0.0/forwarder/mixins/MExchangeWrapper.sol b/packages/contracts/src/2.0.0/forwarder/mixins/MExchangeWrapper.sol index 0fa90fd82..5a2def7e5 100644 --- a/packages/contracts/src/2.0.0/forwarder/mixins/MExchangeWrapper.sol +++ b/packages/contracts/src/2.0.0/forwarder/mixins/MExchangeWrapper.sol @@ -84,4 +84,4 @@ contract MExchangeWrapper { ) internal returns (LibFillResults.FillResults memory totalFillResults); -}
\ No newline at end of file +} |