simplify dvm

contracts/SmartRoute/DODOV2Proxy01.sol

@@ -45,7 +45,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         address sender,
         uint256 fromAmount,
         uint256 returnAmount,
-        uint8 sourceFlag
+        uint256 sourceFlag
     );
 
     // ============ Modifiers ============
@@ -92,7 +92,6 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         uint256 baseInAmount,
         uint256 quoteInAmount,
         uint256 lpFeeRate,
-        uint256 mtFeeRate,
         uint256 i,
         uint256 k,
         uint256 deadLine
@@ -108,11 +107,9 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
             address _baseToken = baseToken == _ETH_ADDRESS_ ? _WETH_ : baseToken;
             address _quoteToken = quoteToken == _ETH_ADDRESS_ ? _WETH_ : quoteToken;
             newVendingMachine = IDODOV2(_DVM_FACTORY_).createDODOVendingMachine(
-                msg.sender,
                 _baseToken,
                 _quoteToken,
                 lpFeeRate,
-                mtFeeRate,
                 i,
                 k
             );
@@ -303,7 +300,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         address toToken,
         uint256 minReturnAmount,
         address[] memory dodoPairs,
-        uint8[] memory directions,
+        uint256 directions,
         uint256 deadLine
     )
         external
@@ -312,7 +309,6 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         judgeExpired(deadLine)
         returns (uint256 returnAmount)
     {
-        require(dodoPairs.length == directions.length, "DODOV2Proxy01: PARAMS_LENGTH_NOT_MATCH");
         uint256 originToTokenBalance = IERC20(toToken).balanceOf(msg.sender);
 
         IWETH(_WETH_).deposit{value: msg.value}();
@@ -320,18 +316,19 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
 
         for (uint256 i = 0; i < dodoPairs.length; i++) {
             if (i == dodoPairs.length - 1) {
-                if (directions[i] == 0) {
+                if (directions & 1 == 0) {
                     IDODOV2(dodoPairs[i]).sellBase(assetTo);
                 } else {
                     IDODOV2(dodoPairs[i]).sellQuote(assetTo);
                 }
             } else {
-                if (directions[i] == 0) {
+                if (directions & 1 == 0) {
                     IDODOV2(dodoPairs[i]).sellBase(dodoPairs[i + 1]);
                 } else {
                     IDODOV2(dodoPairs[i]).sellQuote(dodoPairs[i + 1]);
                 }
             }
+            directions = directions >> 1;
         }
 
         returnAmount = IERC20(toToken).balanceOf(msg.sender).sub(originToTokenBalance);
@@ -352,7 +349,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         uint256 fromTokenAmount,
         uint256 minReturnAmount,
         address[] memory dodoPairs,
-        uint8[] memory directions,
+        uint256 directions,
         uint256 deadLine
     )
         external
@@ -360,23 +357,23 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         judgeExpired(deadLine)
         returns (uint256 returnAmount)
     {
-        require(dodoPairs.length == directions.length, "DODOV2Proxy01: PARAMS_LENGTH_NOT_MATCH");
         IDODOApprove(_DODO_APPROVE_).claimTokens(fromToken, msg.sender, dodoPairs[0], fromTokenAmount);
 
         for (uint256 i = 0; i < dodoPairs.length; i++) {
             if (i == dodoPairs.length - 1) {
-                if (directions[i] == 0) {
+                if (directions & 1 == 0) {
                     IDODOV2(dodoPairs[i]).sellBase(address(this));
                 } else {
                     IDODOV2(dodoPairs[i]).sellQuote(address(this));
                 }
             } else {
-                if (directions[i] == 0) {
+                if (directions & 1 == 0) {
                     IDODOV2(dodoPairs[i]).sellBase(dodoPairs[i + 1]);
                 } else {
                     IDODOV2(dodoPairs[i]).sellQuote(dodoPairs[i + 1]);
                 }
             }
+            directions = directions >> 1;
         }
         returnAmount = IWETH(_WETH_).balanceOf(address(this));
         require(returnAmount >= minReturnAmount, "DODOV2Proxy01: Return amount is not enough");
@@ -399,7 +396,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         uint256 fromTokenAmount,
         uint256 minReturnAmount,
         address[] memory dodoPairs,
-        uint8[] memory directions,
+        uint256 directions,
         uint256 deadLine
     )
         external
@@ -407,24 +404,24 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         judgeExpired(deadLine)
         returns (uint256 returnAmount)
     {
-        require(dodoPairs.length == directions.length, "DODOV2Proxy01: PARAMS_LENGTH_NOT_MATCH");
         uint256 originToTokenBalance = IERC20(toToken).balanceOf(msg.sender);
         IDODOApprove(_DODO_APPROVE_).claimTokens(fromToken, msg.sender, dodoPairs[0], fromTokenAmount);
 
         for (uint256 i = 0; i < dodoPairs.length; i++) {
             if (i == dodoPairs.length - 1) {
-                if (directions[i] == 0) {
+                if (directions & 1 == 0) {
                     IDODOV2(dodoPairs[i]).sellBase(assetTo);
                 } else {
                     IDODOV2(dodoPairs[i]).sellQuote(assetTo);
                 }
             } else {
-                if (directions[i] == 0) {
+                if (directions& 1 == 0) {
                     IDODOV2(dodoPairs[i]).sellBase(dodoPairs[i + 1]);
                 } else {
                     IDODOV2(dodoPairs[i]).sellQuote(dodoPairs[i + 1]);
                 }
             }
+            directions = directions >> 1;
         }
         returnAmount = IERC20(toToken).balanceOf(msg.sender).sub(originToTokenBalance);
         require(returnAmount >= minReturnAmount, "DODOV2Proxy01: Return amount is not enough");

contracts/SmartRoute/helper/DODOV2RouteHelper.sol

@@ -26,6 +26,7 @@ contract DODOV2RouteHelper {
         uint256 mtFeeRate;
         address baseToken;
         address quoteToken;
+        address curPair;
     }
 
     constructor(address dvmFactory,address dppFactory) public {
@@ -39,7 +40,7 @@ contract DODOV2RouteHelper {
         uint256 len = baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length + baseToken1DPP.length;
         res = new PairDetail[](len);
         for(uint8 i = 0; i < len; i++) {
-            PairDetail memory curRes = PairDetail(0,0,0,0,0,0,0,0,0,address(0),address(0));
+            PairDetail memory curRes = PairDetail(0,0,0,0,0,0,0,0,0,address(0),address(0),address(0));
             address cur;
             if(i < baseToken0DVM.length) {
                 cur = baseToken0DVM[i];
@@ -72,7 +73,7 @@ contract DODOV2RouteHelper {
 
                 (curRes.lpFeeRate, curRes.mtFeeRate) = IDODOV2(cur).getUserFeeRate(userAddr);
             }
-    
+            curRes.curPair = cur;
             res[i] = curRes;
         }
     }

contracts/SmartRoute/intf/IDODOV2.sol

@@ -43,11 +43,9 @@ interface IDODOV2 {
     //========== DODOVendingMachine ========
     
     function createDODOVendingMachine(
-        address creator,
         address baseToken,
         address quoteToken,
         uint256 lpFeeRate,
-        uint256 mtFeeRate,
         uint256 i,
         uint256 k
     ) external returns (address newVendingMachine);

contracts/SmartRoute/intf/IDODOV2Proxy01.sol

@@ -16,7 +16,7 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
         address toToken,
         uint256 minReturnAmount,
         address[] memory dodoPairs,
-        uint8[] memory directions,
+        uint256 directions,
         uint256 deadLine
     ) external payable returns (uint256 returnAmount);
 
@@ -26,7 +26,7 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
         uint256 fromTokenAmount,
         uint256 minReturnAmount,
         address[] memory dodoPairs,
-        uint8[] memory directions,
+        uint256 directions,
         uint256 deadLine
     ) external returns (uint256 returnAmount);
 
@@ -37,7 +37,7 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
         uint256 fromTokenAmount,
         uint256 minReturnAmount,
         address[] memory dodoPairs,
-        uint8[] memory directions,
+        uint256 directions,
         uint256 deadLine
     ) external returns (uint256 returnAmount);
 
@@ -48,7 +48,6 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
         uint256 baseInAmount,
         uint256 quoteInAmount,
         uint256 lpFeeRate,
-        uint256 mtFeeRate,
         uint256 i,
         uint256 k,
         uint256 deadLine