aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-09-05 01:37:24 +0800
committerFabio Berger <me@fabioberger.com>2018-09-05 01:37:24 +0800
commit51760f9bddafbd326ca635a283ebff54625c31cf (patch)
tree04cbe061658c4062423aa6ac40c0968c5b250c90 /packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
parent11df29fa8e4f355ec438966fa9e40cb09fe97380 (diff)
parent6a619a4084188d1c48d8030d0fe2a1ba777c55e3 (diff)
downloaddexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.tar
dexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.tar.gz
dexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.tar.bz2
dexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.tar.lz
dexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.tar.xz
dexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.tar.zst
dexon-sol-tools-51760f9bddafbd326ca635a283ebff54625c31cf.zip
merge development
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.sol11
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.