Merge pull request #413 from hack-a-chain-software/transfers-pagination

fix: added the transfer database ID to make the ORDER BY deterministic in the transfers query

Author: mschead

.github/workflows/indexer.yml

@@ -24,7 +24,3 @@ jobs:
       - name: Install dependencies
         run: yarn install
         working-directory: ./indexer
-
-      - name: Build
-        run: tsc
-        working-directory: ./indexer

indexer/src/kadena-server/repository/infra/repository/transfer-db-repository.ts

@@ -91,15 +91,19 @@ export default class TransferDbRepository implements TransferRepository {
     }
 
     if (after) {
-      queryParams.push(after);
+      const [creationTime, id] = after.split(':');
+      queryParams.push(creationTime);
       const op = operator(queryParams.length);
-      conditions += `\n${op} transfers.id < $${queryParams.length}`;
+      queryParams.push(id);
+      conditions += `\n${op} (t.creationtime, t.id) < ($${queryParams.length - 1}, $${queryParams.length})`;
     }
 
     if (before) {
-      queryParams.push(before);
+      const [creationTime, id] = before.split(':');
+      queryParams.push(creationTime);
       const op = operator(queryParams.length);
-      conditions += `\n${op} transfers.id > $${queryParams.length}`;
+      queryParams.push(id);
+      conditions += `\n${op} (t.creationtime, t.id) > ($${queryParams.length - 1}, $${queryParams.length})`;
     }
 
     if (chainId) {
@@ -155,7 +159,7 @@ export default class TransferDbRepository implements TransferRepository {
         join "Transfers" transfers on transfers."transactionId" = t.id
         left join "TransactionDetails" td on t.id = td."transactionId"
         ${conditions}
-        ORDER BY transfers.id ${order}
+        ORDER BY t."creationtime" ${order}, transfers.id ${order}
         LIMIT $1
       `;
     } else if (requestKey) {
@@ -185,47 +189,11 @@ export default class TransferDbRepository implements TransferRepository {
         join "Transfers" transfers on transfers."transactionId" = t.id
         left join "TransactionDetails" td on t.id = td."transactionId"
         ${conditions}
-        ORDER BY transfers.id ${order}
-        LIMIT $1
-      `;
-    } else if (accountName) {
-      query = `
-        WITH filtered_transfers AS (
-          SELECT id, amount, "transactionId", "from_acct", "to_acct", modulename, modulehash, requestkey, "orderIndex"
-          FROM "Transfers" transfers
-          ${conditions}
-          ORDER BY transfers.id ${order}
-          LIMIT ALL
-        )
-        select transfers.id as id,
-        transfers.amount as "transferAmount",
-        t."chainId" as "chainId",
-        t."creationtime" as "creationTime",
-        t.id as "transactionId",
-        b.height as "height",
-        b.hash as "blockHash",
-        transfers."from_acct" as "senderAccount",
-        transfers."to_acct" as "receiverAccount",
-        transfers.modulename as "moduleName",
-        transfers.modulehash as "moduleHash",
-        transfers.requestkey as "requestKey",
-        transfers."orderIndex" as "orderIndex",
-        td.pactid as "pactId"
-        from filtered_transfers transfers
-        join "Transactions" t on t.id = transfers."transactionId"
-        join "Blocks" b on b."id" = t."blockId"
-        left join "TransactionDetails" td on t.id = td."transactionId"
+        ORDER BY t."creationtime" ${order}, transfers.id ${order}
         LIMIT $1
       `;
     } else {
       query = `
-        WITH filtered_transfers AS (
-          SELECT id, amount, "transactionId", "from_acct", "to_acct", modulename, modulehash, requestkey, "orderIndex"
-          FROM "Transfers" transfers
-          ${conditions}
-          ORDER BY transfers.id ${order}
-          LIMIT $1
-        )
         select transfers.id as id,
         transfers.amount as "transferAmount",
         t."chainId" as "chainId",
@@ -240,17 +208,20 @@ export default class TransferDbRepository implements TransferRepository {
         transfers.requestkey as "requestKey",
         transfers."orderIndex" as "orderIndex",
         td.pactid as "pactId"
-        from filtered_transfers transfers
+        from "Transfers" transfers
         join "Transactions" t on t.id = transfers."transactionId"
         join "Blocks" b on b."id" = t."blockId"
         left join "TransactionDetails" td on t.id = td."transactionId"
+        ${conditions}
+        ORDER BY t."creationtime" ${order}, transfers.id ${order}
+        LIMIT $1
       `;
     }
 
     const { rows } = await rootPgPool.query(query, queryParams);
 
     const edges = rows.map(row => ({
-      cursor: row.id.toString(),
+      cursor: `${row.creationTime.toString()}:${row.id.toString()}`,
       node: transferSchemaValidator.validate(row),
     }));
 

indexer/tests/integration/fixtures/transfers/transfers.fixture.001.ts

@@ -2,21 +2,53 @@ export const transfersFixture001 = {
   data: {
     transfers: {
       totalCount: 2,
+      pageInfo: {
+        endCursor: 'MTczNjcxMTA4NDo1ODI3MDQ3',
+        hasNextPage: false,
+        hasPreviousPage: false,
+        startCursor: 'MTczNjcxMTA4NDo1ODI3MDQ4',
+      },
       edges: [
         {
+          cursor: 'MTczNjcxMTA4NDo1ODI3MDQ4',
           node: {
             amount: '34',
+            block: {
+              chainId: 1,
+            },
+            creationTime: '2025-01-12T19:44:44.000Z',
+            crossChainTransfer: null,
+            id: 'VHJhbnNmZXI6WyIwY0tsamlGVlZvbHNhT0hkWWRxLUpSbGJHN0d6WXFfWThfTjFKbjd0UEhZIiwiMSIsIjEiLCI4U1pxZm16cXdGb2ZZVUoyd25NRTBPLS0xSHZlUWtYSDdJZGtHM2JLWjBZIiwiUk54b05DY1FyaUVaVTNwX3FMU2lKQW83QmktMC1PZTdOa2prUEZPS3I3MCJd',
+            moduleHash: '8SZqfmzqwFofYUJ2wnME0O--1HveQkXH7IdkG3bKZ0Y',
+            moduleName: 'n_ebe54249b2e9d68f5060961f3c419f8288d18dc2.unitt',
+            orderIndex: 1,
             receiverAccount: 'k:7577a017eab7067e194fea639dae351406bc139425c7a170ceb4026f829b0816',
+            requestKey: 'RNxoNCcQriEZU3p_qLSiJAo7Bi-0-Oe7NkjkPFOKr70',
             senderAccount: 'ef46137232f1cb9acebf717f94a5a9083e96db16957da79ed0d1df29b0bb4ff8',
-            moduleName: 'n_ebe54249b2e9d68f5060961f3c419f8288d18dc2.unitt',
+            transaction: {
+              id: 'VHJhbnNhY3Rpb246WyIwY0tsamlGVlZvbHNhT0hkWWRxLUpSbGJHN0d6WXFfWThfTjFKbjd0UEhZIiwiUk54b05DY1FyaUVaVTNwX3FMU2lKQW83QmktMC1PZTdOa2prUEZPS3I3MCJd',
+            },
           },
         },
         {
+          cursor: 'MTczNjcxMTA4NDo1ODI3MDQ3',
           node: {
             amount: '0.001766',
+            block: {
+              chainId: 1,
+            },
+            creationTime: '2025-01-12T19:44:44.000Z',
+            crossChainTransfer: null,
+            id: 'VHJhbnNmZXI6WyIwY0tsamlGVlZvbHNhT0hkWWRxLUpSbGJHN0d6WXFfWThfTjFKbjd0UEhZIiwiMSIsIjAiLCJrbEZrckxmcHlMVy1NM3hqVlBTZHFYRU1neFBQSmliUnRfRDZxaUJ3czZzIiwiUk54b05DY1FyaUVaVTNwX3FMU2lKQW83QmktMC1PZTdOa2prUEZPS3I3MCJd',
+            moduleHash: 'klFkrLfpyLW-M3xjVPSdqXEMgxPPJibRt_D6qiBws6s',
+            moduleName: 'coin',
+            orderIndex: 0,
             receiverAccount: 'k:e7f7130f359fb1f8c87873bf858a0e9cbc3c1059f62ae715ec72e760b055e9f3',
+            requestKey: 'RNxoNCcQriEZU3p_qLSiJAo7Bi-0-Oe7NkjkPFOKr70',
             senderAccount: 'k:c55bf5b9f84c33616c31806402f66576b4e59ae4b90830636e38c746a44069fc',
-            moduleName: 'coin',
+            transaction: {
+              id: 'VHJhbnNhY3Rpb246WyIwY0tsamlGVlZvbHNhT0hkWWRxLUpSbGJHN0d6WXFfWThfTjFKbjd0UEhZIiwiUk54b05DY1FyaUVaVTNwX3FMU2lKQW83QmktMC1PZTdOa2prUEZPS3I3MCJd',
+            },
           },
         },
       ],