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/contracts/src/2.0.0/forwarder/Forwarder.sol | |
| 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/contracts/src/2.0.0/forwarder/Forwarder.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/forwarder/Forwarder.sol | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol index 546e7f22c..5b88b05b1 100644 --- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol +++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol @@ -19,20 +19,19 @@ pragma solidity 0.4.24; pragma experimental ABIEncoderV2; -import "./MixinFees.sol"; +import "./MixinWeth.sol"; import "./MixinForwarderCore.sol"; -import "./MixinConstants.sol"; -import "./MixinMarketBuyZrx.sol"; -import "./MixinExpectedResults.sol"; -import "./MixinTransfer.sol"; +import "./libs/LibConstants.sol"; +import "./MixinAssets.sol"; +import "./MixinExchangeWrapper.sol"; +// solhint-disable no-empty-blocks contract Forwarder is - MixinConstants, - MixinExpectedResults, - MixinFees, - MixinMarketBuyZrx, - MixinTransfer, + LibConstants, + MixinWeth, + MixinAssets, + MixinExchangeWrapper, MixinForwarderCore { @@ -44,7 +43,7 @@ contract Forwarder is bytes memory _wethAssetData ) public - MixinConstants( + LibConstants( _exchange, _etherToken, _zrxToken, |