Atomic Order Matching - Smart Contracts.

1 files changed, 9 insertions, 5 deletions

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
index 85e2bc47e..438d50ecf 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
@@ -25,24 +25,28 @@ import "./MixinSettlement.sol";
 import "./MixinWrapperFunctions.sol";
 import "./MixinAssetProxyDispatcher.sol";
 import "./MixinTransactions.sol";
+import "./MixinMatchOrders.sol";
 
 contract Exchange is
-    MixinWrapperFunctions,
     MixinExchangeCore,
+    MixinMatchOrders,
     MixinSettlement,
     MixinSignatureValidator,
     MixinTransactions,
-    MixinAssetProxyDispatcher
+    MixinAssetProxyDispatcher,
+    MixinWrapperFunctions
 {
+
     string constant public VERSION = "2.0.1-alpha";
 
     constructor (bytes memory _zrxProxyData)
         public
         MixinExchangeCore()
-        MixinSignatureValidator()
+        MixinMatchOrders()
         MixinSettlement(_zrxProxyData)
-        MixinWrapperFunctions()
-        MixinAssetProxyDispatcher()
+        MixinSignatureValidator()
         MixinTransactions()
+        MixinAssetProxyDispatcher()
+        MixinWrapperFunctions()
     {}
 }