fix(datastore): broker not updating settlement

ulixee · Oct 26, 2024 · efbf866 · efbf866
1 parent afed957
commit efbf866
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 27 deletions.
diff --git a/datastore/core/db/DatastoreChannelHoldsDb.ts b/datastore/core/db/DatastoreChannelHoldsDb.ts
@@ -137,12 +137,12 @@ export default class DatastoreChannelHoldsDb {
       if (channelHold.remaining < payment.microgons) {
         throw new Error('This channelHold does not have enough remaining funds.');
       }
-      if (
-        Math.ceil((channelHold.allocated - channelHold.remaining + payment.microgons) / 1000) >
-        Number(payment.channelHold.settledMilligons)
-      ) {
+      const neededMilligons = Math.ceil(
+        (channelHold.allocated - channelHold.remaining + payment.microgons) / 1000,
+      );
+      if (neededMilligons > Number(payment.channelHold.settledMilligons)) {
         throw new Error(
-          `This channelHold needs a larger settlement to debit. Current settledMilligons=${payment.channelHold.settledMilligons}, New spentMicrogons=${channelHold.allocated - channelHold.remaining + payment.microgons} (ceiling to nearest milligon)`,
+          `This channelHold needs a larger settlement to debit. Current settledMilligons=${payment.channelHold.settledMilligons}, New spentMicrogons=${neededMilligons} (ceiling to nearest milligon)`,
         );
       }
       throw new Error('Could not debit the channelHold.');
@@ -162,7 +162,7 @@ export default class DatastoreChannelHoldsDb {
     const result = this.finalizeStatement.run({ id: channelHoldId, microgons: adjustment });
     if (!result.changes || result.changes < 1) {
       throw new Error(
-        `Could not finalize the payment. ${channelHoldId} -> adjustment: ${adjustment}`,
+        `Could not finalize the payment. ${channelHoldId} -> adjustment: ${adjustment} (entry: ${entry.microgons}, final: ${finalMicrogons})`,
       );
     }
   }

diff --git a/datastore/main/payments/BrokerChannelHoldSource.ts b/datastore/main/payments/BrokerChannelHoldSource.ts
@@ -103,6 +103,8 @@ export default class BrokerChannelHoldSource implements IChannelHoldSource {
     const bytes = BalanceChangeBuilder.toSigningMessage(json);
     const signature = this.keyring.getPairs()[0].sign(bytes, { withType: true });
     balanceChange.signature = Buffer.from(signature);
+    channelHold.settledSignature = balanceChange.signature;
+    channelHold.settledMilligons = updatedSettlement;
   }
 
   public static createSignatureMessage(

diff --git a/end-to-end/lib/TestDatabroker.ts b/end-to-end/lib/TestDatabroker.ts
@@ -100,29 +100,34 @@ export default class TestDatabroker {
     Helpers.onClose(() => adminConnection.disconnect());
     await adminConnection.connect();
     await new Promise(setImmediate);
-    console.log('connected');
-    const { id } = await adminConnection.sendRequest({
-      command: 'Organization.create',
-      args: [
-        {
-          name: 'Test Organization',
-          balance: amount,
-        },
-      ],
-    }, 10e3);
+    const { id } = await adminConnection.sendRequest(
+      {
+        command: 'Organization.create',
+        args: [
+          {
+            name: 'Test Organization',
+            balance: amount,
+          },
+        ],
+      },
+      10e3,
+    );
 
     const identity = Identity.loadFromFile(identityPath).bech32;
 
     console.log('[DATABROKER] Registering user', identity);
-    await adminConnection.sendRequest({
-      command: 'User.create',
-      args: [
-        {
-          identity,
-          organizationId: id,
-        },
-      ],
-    }, 10e3);
+    await adminConnection.sendRequest(
+      {
+        command: 'User.create',
+        args: [
+          {
+            identity,
+            organizationId: id,
+          },
+        ],
+      },
+      10e3,
+    );
     console.log('[DATABROKER] Registered user', identity);
     await adminConnection.disconnect();
   }

diff --git a/end-to-end/test/payments-broker.e2e.test.ts b/end-to-end/test/payments-broker.e2e.test.ts
@@ -207,8 +207,8 @@ async function setupDatastore(
       1,
       {
         [version]: mainchainClient.createType('ArgonPrimitivesDomainVersionHost', {
-          datastoreId: mainchainClient.createType('Bytes', datastoreId),
-          host: mainchainClient.createType('Bytes', `ws://127.0.0.1:${cloudAddress.split(':')[1]}`),
+          datastoreId,
+          host: `ws://127.0.0.1:${cloudAddress.split(':')[1]}`,
         }),
       },
     );