commit to incoming amounts

ledgerloops · Apr 25, 2024 · 91c994c · 91c994c
1 parent 6453782
commit 91c994c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/__tests__/fixtures/batched-giraffe-triangle.json b/__tests__/fixtures/batched-giraffe-triangle.json
@@ -50,9 +50,10 @@
     "[Bob]->[Alice] propose genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999",
     "[Charlie]->[Bob] trace genRanHex2 genRanHex9 genRanHex11",
     "[---]->[---] ---",
-    "[Alice]->[Bob] commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 1 genRanHex8",
+    "[Alice]->[Bob] commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999 genRanHex8",
     "[Bob]->[Alice] propose genRanHex2 genRanHex9 genRanHex11 65f02d86bab050169c984f0baff90573687c783688a57c4c06ad86e69bf0fa13 1",
     "[---]->[---] ---",
+    "[Bob]->[Charlie] commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.9399999999999995 genRanHex8",
     "[Alice]->[Charlie] propose genRanHex2 genRanHex9 genRanHex11 65f02d86bab050169c984f0baff90573687c783688a57c4c06ad86e69bf0fa13 0.99",
     "[---]->[---] ---",
     "[---]->[---] ---"
@@ -130,7 +131,7 @@
       "Looking for a party in genRanHex0 genRanHex3 with genRanHex4 other than Bob in created: {\"Charlie\":\"genRanHex4\"}",
       "Bob propose genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999 {\"name\":\"Charlie\",\"maxBalance\":10,\"exchangeRate\":1} {\"name\":\"Bob\",\"maxBalance\":10,\"exchangeRate\":1}",
       "initiator decides on lift: is 5.880599999999999 more than 1?",
-      "[Node#sendTracMessage] Alice sends loops message to Bob: commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 1 genRanHex8",
+      "[Node#sendTracMessage] Alice sends loops message to Bob: commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999 genRanHex8",
       "[Node#receiveMessage] Alice receives message from Bob",
       "Looking for a party in genRanHex2 genRanHex9 with genRanHex11 other than Bob in created: undefined",
       "Looking for a party in genRanHex2 genRanHex9 with genRanHex11 other than Bob in forwarded: {\"Bob\":\"genRanHex11\",\"Charlie\":\"genRanHex11\"}",
@@ -207,9 +208,9 @@
       "[Node#receiveMessage] Bob receives message from Alice",
       "Looking for a party in genRanHex0 genRanHex3 with genRanHex4 other than Alice in created: undefined",
       "Looking for a party in genRanHex0 genRanHex3 with genRanHex4 other than Alice in forwarded: {\"Charlie\":\"genRanHex4\",\"Alice\":\"genRanHex4\"}",
-      "Alice commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 1 genRanHex8 {\"name\":\"Alice\",\"maxBalance\":10,\"exchangeRate\":1} {\"name\":\"Charlie\",\"maxBalance\":10,\"exchangeRate\":2}",
-      "commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 1 genRanHex8 is about {\"loop\":\"genRanHex0 genRanHex3\",\"legId\":\"genRanHex4\",\"incomingAmount\":5.9399999999999995,\"outgoingAmount\":5.880599999999999}",
-      "commit message for hash 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad with unexpected amount 1"
+      "Alice commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999 genRanHex8 {\"name\":\"Alice\",\"maxBalance\":10,\"exchangeRate\":1} {\"name\":\"Charlie\",\"maxBalance\":10,\"exchangeRate\":2}",
+      "commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999 genRanHex8 is about {\"loop\":\"genRanHex0 genRanHex3\",\"legId\":\"genRanHex4\",\"incomingAmount\":5.9399999999999995,\"outgoingAmount\":5.880599999999999}",
+      "[Node#sendTracMessage] Bob sends loops message to Charlie: commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.9399999999999995 genRanHex8"
     ],
     "loopsFound": [
       "genRanHex2 genRanHex9"
@@ -277,6 +278,12 @@
       "[TraceEngine] in the context of trace message from Alice: trace genRanHex2 genRanHex9 genRanHex11, we found these counter-probe-wise next hops: [], and otherLeg Bob",
       "[TracesEngine] found otherLeg Bob for trace genRanHex9 of probe genRanHex2",
       "[traceEngine.on-message] Charlie sends trace message to Bob: trace genRanHex2 genRanHex9 genRanHex11",
+      "[Node#receiveMessage] Charlie receives message from Bob",
+      "Looking for a party in genRanHex0 genRanHex3 with genRanHex4 other than Bob in created: undefined",
+      "Looking for a party in genRanHex0 genRanHex3 with genRanHex4 other than Bob in forwarded: {\"Alice\":\"genRanHex4\",\"Bob\":\"genRanHex4\"}",
+      "Bob commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.9399999999999995 genRanHex8 {\"name\":\"Bob\",\"maxBalance\":10,\"exchangeRate\":1} {\"name\":\"Alice\",\"maxBalance\":10,\"exchangeRate\":3}",
+      "commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.9399999999999995 genRanHex8 is about {\"loop\":\"genRanHex0 genRanHex3\",\"legId\":\"genRanHex4\",\"incomingAmount\":3,\"outgoingAmount\":2.9699999999999998}",
+      "commit message for hash 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad with unexpected amount 5.9399999999999995",
       "[Node#receiveMessage] Charlie receives message from Alice",
       "Looking for a party in genRanHex2 genRanHex9 with genRanHex11 other than Alice in created: undefined",
       "Looking for a party in genRanHex2 genRanHex9 with genRanHex11 other than Alice in forwarded: {\"Bob\":\"genRanHex10\",\"Alice\":\"genRanHex11\"}",

diff --git a/__tests__/fixtures/batched-giraffe-triangle.puml b/__tests__/fixtures/batched-giraffe-triangle.puml
@@ -24,7 +24,8 @@ Alice -[#green]-> Charlie: trace genRanHex2 genRanHex9 genRanHex11
 Charlie -[#black]-> Bob: propose genRanHex1 genRanHex5 genRanHex6 1cfb9bc69068fa3e1a68ed4ec04c80d4e18e3f3ecec3cc40c355aee5b6c03933 2.9699999999999998
 Bob -[#black]-> Alice: propose genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999
 Charlie -[#green]-> Bob: trace genRanHex2 genRanHex9 genRanHex11
-Alice -[#black]-> Bob: commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 1 genRanHex8
+Alice -[#black]-> Bob: commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.880599999999999 genRanHex8
 Bob -[#black]-> Alice: propose genRanHex2 genRanHex9 genRanHex11 65f02d86bab050169c984f0baff90573687c783688a57c4c06ad86e69bf0fa13 1
+Bob -[#black]-> Charlie: commit genRanHex0 genRanHex3 genRanHex4 07a57c2781ad32f96a052696b012bafbc84f6f379bed18a1c495c0fd84881aad 5.9399999999999995 genRanHex8
 Alice -[#black]-> Charlie: propose genRanHex2 genRanHex9 genRanHex11 65f02d86bab050169c984f0baff90573687c783688a57c4c06ad86e69bf0fa13 0.99
 @enduml
diff --git a/src/engine/loopsengine.ts b/src/engine/loopsengine.ts
@@ -53,7 +53,7 @@ export class LoopsEngine extends EventEmitter {
       this.lifts[hash].incomingAmount = parseFloat(amount);
       this.emit('debug', `initiator decides on lift: is ${this.lifts[hash].incomingAmount} more than ${this.lifts[hash].outgoingAmount}?`);
       if (this.lifts[hash].incomingAmount >= this.lifts[hash].outgoingAmount) {
-        this.emit('message', proposer.name, `commit ${probeId} ${traceId} ${legId} ${hash} ${this.lifts[hash].outgoingAmount} ${this.lifts[hash].secret}`);
+        this.emit('message', proposer.name, `commit ${probeId} ${traceId} ${legId} ${hash} ${this.lifts[hash].incomingAmount} ${this.lifts[hash].secret}`);
       }
     } else {
       const incomingAmount = parseFloat(amount) * proposer.exchangeRate;
@@ -94,7 +94,7 @@ export class LoopsEngine extends EventEmitter {
       this.emit('debug', 'lift was successfully completed');
     } else {
       this.lifts[hash].secret = secret;
-      this.emit('message', proposer.name, `commit ${probeId} ${traceId} ${legId} ${hash} ${amount} ${this.lifts[hash].secret}`);
+      this.emit('message', proposer.name, `commit ${probeId} ${traceId} ${legId} ${hash} ${this.lifts[hash].incomingAmount} ${this.lifts[hash].secret}`);
     }
   }
   getLoops(): string[] {