Merge pull request #76 from Loopring/v2

V2

Author: dyfvicture

src/ethereum/contracts/Contracts.js

@@ -1,4 +1,8 @@
 import Contract from './Contract';
+import validator from '../validator'
+import {getRingHash} from '../../relay/rpc/ring'
+import { addHexPrefix, toBig, toBuffer, toFixed, toHex, toNumber} from '../../common/formatter'
+import {ecsign} from 'ethereumjs-util'
 
 const erc20Abi = require('../../config/abis/erc20.json');
 const wethAbi = require('../../config/abis/weth.json');
@@ -12,7 +16,7 @@ const LoopringProtocol = new Contract(loopringProtocolAbi);
 
 const encodeCancelOrder = (signedOrder, amount) => {
   const {
-    owner, tokenS, tokenB, walletAddress,authAddr,
+    owner, tokenS, tokenB, walletAddress, authAddr,
     amountS, amountB, validSince, validUntil, lrcFee,
     buyNoMoreThanAmountB,
     marginSplitPercentage,
@@ -26,8 +30,41 @@ const encodeCancelOrder = (signedOrder, amount) => {
   return LoopringProtocol.encodeInputs('cancelOrder',{addresses, orderValues, buyNoMoreThanAmountB, marginSplitPercentage, v, r, s});
 };
 
+const encodeSubmitRing = (orders, feeRecipient, feeSelections) => {
 
-Object.assign(LoopringProtocol,{encodeCancelOrder});
+  validator.validate({type: 'ETH_ADDRESS', value: feeRecipient})
+  if(feeSelections === null || feeSelections === undefined){
+    feeSelections = 0;
+  }
+  const rate = Math.pow(orders.reduce(order => (total,order) => {
+    total.times(toBig(order.amountS).div(toBig(order.amountB)))
+  }), orders.length);
+
+  const ringHash = getRingHash(orders, feeRecipient, feeSelections);
+  const addressList = orders.map(order => [order.owner,order.tokenS,order.walletAddress,order.authAddr])
+  const uintArgsList = orders.map(order => [order.amountS,order.amountB,order.validSince,order.validUntil,order.lrcFee, toHex(toBig(toFixed(toBig(order.amountS).times(toBig(rate)))))])
+  const uint8ArgsList = orders.map(order => [order.marginSplitPercentage])
+  const buyNoMoreThanAmountBList = orders.map(order => order.buyNoMoreThanAmountB)
+  const sigs = orders.map(order => {
+    const sig = ecsign(ringHash, toBuffer(addHexPrefix(order.authPrivateKey)))
+    return {
+      v: toNumber(sig.v),
+      r: toHex(sig.r),
+      s: toHex(sig.s)
+    }
+  })
+  const vList = orders.map(order => order.v);
+  vList.push(...sigs.map(sig => sig.v));
+  const rList = orders.map(order => order.r);
+  rList.push(...sigs.map(sig => sig.r));
+  const sList = orders.map(order => order.s);
+  sList.push(...sigs.map(sig => sig.s));
+
+  return LoopringProtocol.encodeInputs('submitRing',{addressList,uintArgsList,uint8ArgsList,buyNoMoreThanAmountBList,vList,rList,sList,feeRecipient,feeSelections})
+}
+
+
+Object.assign(LoopringProtocol,{encodeCancelOrder,encodeSubmitRing});
 
 export default {
   ERC20Token,

src/relay/rpc/ring.js

@@ -4,6 +4,8 @@ import validator from '../validator'
 import Response from '../../common/response'
 import code from "../../common/code"
 import {toBig, toHex} from "../../common/formatter";
+import {getOrderHash} from './order'
+import {soliditySHA3} from 'ethereumjs-abi'
 
 export default class Ring{
 
@@ -22,6 +24,10 @@ export default class Ring{
   getFills(filter){
     return getFills(this.host,filter)
   }
+
+  getRingHash(orders, feeRecipient, feeSelections){
+    return getRingHash(orders, feeRecipient, feeSelections)
+  }
 }
 
 /**
@@ -119,3 +125,29 @@ export function getFills(host,filter) {
 }
 
 
+export function getRingHash (orders,feeRecipient, feeSelections) {
+  const orderHashList = orders.map(order =>getOrderHash(order) )
+  return soliditySHA3(["string", "address", "uint16"],[
+    xorReduceStr(orderHashList),
+    feeRecipient,
+    feeSelections
+  ]);
+
+}
+
+
+function xorReduceStr(strArr){
+  const s0 = strArr[0];
+  const tail = strArr.slice(1);
+  const strXor = (s1, s2) => {
+    const buf1 = Buffer.from(s1.slice(2), "hex");
+    const buf2 = Buffer.from(s2.slice(2), "hex");
+    const res = Buffer.alloc(32);
+    for (let i = 0; i < 32; i++) {
+      res[i] = buf1[i] ^ buf2[i];
+    }
+    return toHex(res);
+  };
+  const reduceRes = tail.reduce((a, b) => strXor(a, b), s0);
+  return Buffer.from(reduceRes.slice(2), "hex");
+}