Merge pull request #106 from Loopring/v2

V2

Author: dyfvicture

docs/index.md

@@ -103,6 +103,7 @@ Get public key using the private key
 - privateKey  hex string  or  Buffer
 
 ##### Returns
+
 - publickey  hex string, without prefix
 
 ##### Example
@@ -143,7 +144,7 @@ Get keyAccount using the keystore and password
 ##### Parameters
 
 -  keystore  string
--  password  string - can be empty, depending on whether the keystore requires a password to unlock it.
+- password  string - can be empty, depending on whether the keystore requires a password to unlock it.
 
 ##### Returns
 

src/ethereum/contracts/Contracts.js

@@ -34,9 +34,9 @@ const encodeCancelOrder = (signedOrder, amount) =>
 const encodeSubmitRing = (orders, feeRecipient, feeSelections) =>
 {
     validator.validate({type: 'ETH_ADDRESS', value: feeRecipient});
-    if (feeSelections === null || feeSelections === undefined)
+    if (!feeSelections)
     {
-        feeSelections = 0;
+        feeSelections = orders.map(item => 0);
     }
     const rate = Math.pow(orders.reduce(order => (total, order) =>
     {

src/relay/rpc/ring.js

@@ -154,7 +154,7 @@ export function getRingHash (orders, feeRecipient, feeSelections)
     return soliditySHA3(['string', 'address', 'uint16'], [
         xorReduceStr(orderHashList),
         feeRecipient,
-        feeSelections
+        feeSelectionListToNumber(feeSelections)
     ]);
 }
 
@@ -176,3 +176,14 @@ function xorReduceStr (strArr)
     const reduceRes = tail.reduce((a, b) => strXor(a, b), s0);
     return Buffer.from(reduceRes.slice(2), 'hex');
 }
+
+function feeSelectionListToNumber (feeSelections)
+{
+    let res = 0;
+    for (let i = 0; i < feeSelections.length; i++)
+    {
+        res += feeSelections[i] << i;
+    }
+
+    return res;
+}