Merge branch 'v1.1_support_isMakerOnly' into 'v1.1'

V1.1 support is maker only

See merge request hydro/protocol!21

Author: mingmin-101

contracts/HybridExchange.sol

@@ -127,6 +127,7 @@ contract HybridExchange is LibMath, LibOrder, LibRelayer, LibDiscount, LibExchan
         OrderAddressSet memory orderAddressSet
     ) public {
         require(canMatchOrdersFrom(orderAddressSet.relayer), INVALID_SENDER);
+        require(!isMakerOnly(takerOrderParam.data), MAKER_ONLY_ORDER_CANNOT_BE_TAKER);
 
         bool isParticipantRelayer = isParticipant(orderAddressSet.relayer);
         uint256 takerFeeRate = getTakerFeeRate(takerOrderParam, isParticipantRelayer);

contracts/helper/TestOrder.sol

@@ -32,4 +32,8 @@ contract TestOrder is LibOrder {
     function getMakerRebateRateFromOrderDataPublic(bytes32 data) public pure returns (uint256) {
         return getMakerRebateRateFromOrderData(data);
     }
+
+    function isMakerOnlyPublic(bytes32 data) public pure returns (bool) {
+        return isMakerOnly(data);
+    }
 }

contracts/lib/LibExchangeErrors.sol

@@ -33,4 +33,6 @@ contract LibExchangeErrors {
     string constant MAKER_ORDER_OVER_MATCH = "MAKER_ORDER_OVER_MATCH";
     string constant TAKER_ORDER_OVER_MATCH = "TAKER_ORDER_OVER_MATCH";
     string constant ORDER_VERSION_NOT_SUPPORTED = "ORDER_VERSION_NOT_SUPPORTED";
+
+    string constant MAKER_ONLY_ORDER_CANNOT_BE_TAKER = "MAKER_ONLY_ORDER_CANNOT_BE_TAKER";
 }

contracts/lib/LibOrder.sol

@@ -49,7 +49,8 @@ contract LibOrder is EIP712, LibSignature, LibMath {
          * ║ asTakerFeeRate     │ 2               taker fee rate (base 100,000)             ║
          * ║ makerRebateRate    │ 2               rebate rate for maker (base 100)          ║
          * ║ salt               │ 8               salt                                      ║
-         * ║                    │ 10              reserved                                  ║
+         * ║ isMakerOnly        │ 1               is maker only                             ║
+         * ║                    │ 9               reserved                                  ║
          * ╚════════════════════╧═══════════════════════════════════════════════════════════╝
          */
         bytes32 data;
@@ -141,6 +142,10 @@ contract LibOrder is EIP712, LibSignature, LibMath {
         return data[2] == 1;
     }
 
+    function isMakerOnly(bytes32 data) internal pure returns (bool) {
+        return data[22] == 1;
+    }
+
     function isMarketBuy(bytes32 data) internal pure returns (bool) {
         return !isSell(data) && isMarketOrder(data);
     }

sdk/sdk.js

@@ -44,7 +44,8 @@ const generateOrderData = (
     asMakerFeeRate,
     asTakerFeeRate,
     makerRebateRate,
-    salt
+    salt,
+    isMakerOnly
 ) => {
     let res = '0x';
     res += addLeadingZero(new BigNumber(version).toString(16), 2);
@@ -55,6 +56,7 @@ const generateOrderData = (
     res += addLeadingZero(new BigNumber(asTakerFeeRate).toString(16), 2 * 2);
     res += addLeadingZero(new BigNumber(makerRebateRate).toString(16), 2 * 2);
     res += addLeadingZero(new BigNumber(salt).toString(16), 8 * 2);
+    res += isMakerOnly ? '01' : '00';
 
     return addTailingZero(res, 66);
 };

test/order_test.js

@@ -30,7 +30,8 @@ contract('Order', accounts => {
             makerFeeRate,
             takerFeeRate,
             makerRebateRate,
-            salt
+            salt,
+            true
         );
 
         // version            hex                         01
@@ -41,7 +42,8 @@ contract('Order', accounts => {
         // 50000              hex                      c3 50
         // makerRebateRate    hex                      00 00
         // 488701836          hex    00 00 00 00 1d 20 ff 8c
-        assert.equal('0x010100005bbf0d4e2710c3500000000000001d20ff8c00000000000000000000', data);
+        // isMakerOnly        hex                         01
+        assert.equal('0x010100005bbf0d4e2710c3500000000000001d20ff8c01000000000000000000', data);
     });
 
     it('should parse out expired at from data', async () => {
@@ -120,4 +122,10 @@ contract('Order', accounts => {
         res = await contract.methods.getMakerRebateRateFromOrderDataPublic(data).call();
         assert.equal(100, res);
     });
+
+    it('should parse isMakerOnly', async () => {
+        let data = generateOrderData(0, 0, 0, 0, 0, 0, 0, 0, true);
+        let res = await contract.methods.isMakerOnlyPublic(data).call();
+        assert.equal(true, res);
+    });
 });