ordershapes

src/socket.js

@@ -95,13 +95,29 @@ socket.on( 'of', (chainId, vault, orderIndex, filled)=>{
 
     const status = s.orders[vault][orderIndex]
     console.log('apply fills', status, filled)
-    status.filledIn = BigInt(filled[0][0])
-    status.filledOut = BigInt(filled[0][1])
-    for( const i in filled[1] ) {
-        const [filledIn, filledOut] = filled[1][i]
-        status.trancheStatus[i].filledIn = BigInt(filledIn)
-        status.trancheStatus[i].filledOut = BigInt(filledOut)
+
+    let orderIn = 0n
+    let orderOut = 0n
+    const ts = status.trancheStatus[i]
+    for (const i in filled) {
+        let filledIn = 0n
+        let filledOut = 0n
+        const [activationTime, fills] = filled[i];
+        ts.fills = []
+        for (const fill of fills) {
+            const [tx, time, fi, fo, fee] = fill
+            filledIn += fi
+            filledOut += fo
+            ts.fills.push({tx, time, filledIn:fi, filledOut:fo, fee, filled:status.order.amountIsInput?fi:fo})
+        }
+        ts.filledIn = filledIn
+        ts.filledOut = filledOut
+        ts.activationTime = activationTime
+        orderIn += filledIn
+        orderOut += filledOut
     }
-    // s.orders[vault][orderIndex] = status
-    console.log('applied fills', status)
+    status[7] = orderIn.toString()
+    status[8] = orderOut.toString()
+
+    console.log('apply fills completed', status)
 })