aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-07-10 12:09:45 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-07-23 23:00:23 +0800
commit814518dd8094d03908d77e39faa21b8758f1552b (patch)
tree7da9bd14251b2f1e3c23a8bbbd844c11c8a2b1d0 /packages/contracts/src/2.0.0/forwarder/Forwarder.sol
parent554b18a466d5cc65271daa61aba96138ce7408f0 (diff)
downloaddexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.tar
dexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.tar.gz
dexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.tar.bz2
dexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.tar.lz
dexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.tar.xz
dexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.tar.zst
dexon-sol-tools-814518dd8094d03908d77e39faa21b8758f1552b.zip
Refactor forwarding contract architecture, remove batch functions
Diffstat (limited to 'packages/contracts/src/2.0.0/forwarder/Forwarder.sol')
-rw-r--r--packages/contracts/src/2.0.0/forwarder/Forwarder.sol13
1 files changed, 5 insertions, 8 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..4405d5e46 100644
--- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
+++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
@@ -19,20 +19,17 @@
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 "./MixinAssets.sol";
+// solhint-disable no-empty-blocks
contract Forwarder is
MixinConstants,
- MixinExpectedResults,
- MixinFees,
- MixinMarketBuyZrx,
- MixinTransfer,
+ MixinWeth,
+ MixinAssets,
MixinForwarderCore
{