diff options
| author | F. Eugene Aumson <feuGeneA@users.noreply.github.com> | 2018-09-12 07:00:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 07:00:11 +0800 |
| commit | cbb5a425dfb45d1dfda3579548d6b3f70dfca166 (patch) | |
| tree | 8751979ad70ed0eb61dfda5a954bb9e1bc3d5c3b /packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol | |
| parent | 800dd5fb4f0ab21388440a46aef21cd0cf0801c3 (diff) | |
| parent | 45b68832aa3eb5c09db33140468ab737114be9e3 (diff) | |
| download | dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.gz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.bz2 dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.lz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.xz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.zst dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.zip | |
Merge branch 'development' into sol-doc
Diffstat (limited to 'packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol index 14f191879..54487f726 100644 --- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol +++ b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol @@ -39,7 +39,6 @@ contract MixinForwarderCore is MExchangeWrapper, IForwarderCore { - using LibBytes for bytes; /// @dev Constructor approves ERC20 proxy to transfer ZRX and WETH on this contract's behalf. @@ -47,10 +46,12 @@ contract MixinForwarderCore is public { address proxyAddress = EXCHANGE.getAssetProxy(ERC20_DATA_ID); - if (proxyAddress != address(0)) { - ETHER_TOKEN.approve(proxyAddress, MAX_UINT); - ZRX_TOKEN.approve(proxyAddress, MAX_UINT); - } + require( + proxyAddress != address(0), + "UNREGISTERED_ASSET_PROXY" + ); + ETHER_TOKEN.approve(proxyAddress, MAX_UINT); + ZRX_TOKEN.approve(proxyAddress, MAX_UINT); } /// @dev Purchases as much of orders' makerAssets as possible by selling up to 95% of transaction's ETH value. |