tapimo 0.19.0 → 0.20.0

package/dist/apps/data/routes/activities.js

@@ -83,8 +83,7 @@ export var schema;
             .check(z.describe('For outbound transfers, who signed it: `self` or the access-key address. Omitted for inbound transfers.')),
         sourceAmount: SourceAmount,
         sourceToken: schema.Token.check(z.describe('Token that moved in the transfer.')),
-        timestamp: z
-            .iso.datetime()
+        timestamp: Schema.dateTime()
             .check(z.describe('Block timestamp for the transfer.'), z.meta({ examples: ['2024-01-01T00:00:00Z'] })), // prettier-ignore
         transactionHash: Schema.Hash.check(z.describe('Transaction hash that contains this transfer.')),
     })
@@ -143,8 +142,7 @@ export var schema;
         logIndex: z
             .number()
             .check(z.int(), z.nonnegative(), z.describe('Log index for this activity within the block.'), z.meta({ examples: [3] })),
-        timestamp: z
-            .iso.datetime()
+        timestamp: Schema.dateTime()
             .check(z.describe('Block timestamp as an ISO 8601 string.'), z.meta({ examples: ['2024-01-01T00:00:00Z'] })), // prettier-ignore
         title: z
             .string()
@@ -1288,8 +1286,7 @@ export var schema;
                 '0x515801d7f9a5ac705e793e85904c9c69b3f1694b465cc8fb6ba3f0298dc82665-3..0x515801d7f9a5ac705e793e85904c9c69b3f1694b465cc8fb6ba3f0298dc82665-7:5',
             ],
         })),
-        timestamp: z
-            .iso.datetime()
+        timestamp: Schema.dateTime()
             .check(z.describe('Timestamp of the first item in the group, as an ISO 8601 string.'), z.meta({ examples: ['2024-01-01T00:00:00Z'] })), // prettier-ignore
         title: z
             .literal('Group')
@@ -1349,6 +1346,8 @@ export var schema;
             sender: z
                 .optional(Schema.Address)
                 .check(z.describe('Only include activities sent from this sender address.')),
+            'timestamp.from': Schema.timestampBound('activities', 'from'),
+            'timestamp.to': Schema.timestampBound('activities', 'to'),
             token: z
                 .optional(Schema.TokenAddress)
                 .check(z.describe('Only include activities with a source, destination, or refund token for this TIP-20 contract.')),
@@ -1375,6 +1374,11 @@ export var schema;
                 parseValuationAmount(query['valuation.amount.to']), {
             error: '`valuation.amount.from` must be less than or equal to `valuation.amount.to`.',
             path: ['valuation.amount.from'],
+        }), z.refine((query) => query['timestamp.from'] === undefined ||
+            query['timestamp.to'] === undefined ||
+            query['timestamp.from'] <= query['timestamp.to'], {
+            error: '`timestamp.from` must be less than or equal to `timestamp.to`.',
+            path: ['timestamp.from'],
         }), z.describe('Query parameters for the address activity request. This feed uses cursor pagination only because activity classification can fold a variable number of rows into each entry, so positional `page` pagination would not be stable.'));
         /**
          * Page of classified activity. Mirrors the wallet activity feed: a
@@ -1869,9 +1873,20 @@ export function addresses(options = {}) {
                 ...(query.sender ? { sender: query.sender } : {}),
                 ...(query.token ? { token: query.token } : {}),
             };
-            const candidate = Object.keys(activityFilter).length > 0 ? activityFilter : undefined;
+            const filterByActivity = Object.keys(activityFilter).length > 0;
+            const timestampBounds = {
+                ...(query['timestamp.from'] !== undefined ? { from: query['timestamp.from'] } : {}),
+                ...(query['timestamp.to'] !== undefined ? { to: query['timestamp.to'] } : {}),
+            };
+            const filterByTimestamp = Object.keys(timestampBounds).length > 0;
+            const candidate = filterByActivity || filterByTimestamp
+                ? {
+                    ...activityFilter,
+                    ...(filterByTimestamp ? { timestamp: timestampBounds } : {}),
+                }
+                : undefined;
             const types = new Set(query.type);
-            const refine = types.size > 0 || candidate ? (items) => filterActivities({ filter: activityFilter, items: items.filter((item) => types.size === 0 || types.has(item.type)) }) : undefined; // prettier-ignore
+            const refine = types.size > 0 || filterByActivity ? (items) => filterActivities({ filter: activityFilter, items: items.filter((item) => types.size === 0 || types.has(item.type)) }) : undefined; // prettier-ignore
             const listed = await Timing.time(c, 'address_activities', async () => {
                 if (!query.include.includes('zones')) {
                     const result = await Store.memoize((signal) => list(tidx({
@@ -1912,7 +1927,7 @@ export function addresses(options = {}) {
                         store: c.get('store'),
                         time: (name, fn) => Timing.sum(c, name, fn),
                     }), {
-                        key: `activities:v5:${chainId}:${address.toLowerCase()}:${query.type.join(',')}:${query['amount.from'] ?? ''}:${query['amount.to'] ?? ''}:${query.recipient ?? ''}:${query.sender ?? ''}:${query.token ?? ''}:${query['valuation.amount.from'] ?? ''}:${query['valuation.amount.to'] ?? ''}:${query['valuation.currency'] ?? ''}:${query.group ?? false}:${query.logs ?? false}:${query.cursor ?? 'head'}:${query.limit}`,
+                        key: `activities:v6:${chainId}:${address.toLowerCase()}:${query.type.join(',')}:${query['amount.from'] ?? ''}:${query['amount.to'] ?? ''}:${query.recipient ?? ''}:${query.sender ?? ''}:${query.token ?? ''}:${query['timestamp.from'] ?? ''}:${query['timestamp.to'] ?? ''}:${query['valuation.amount.from'] ?? ''}:${query['valuation.amount.to'] ?? ''}:${query['valuation.currency'] ?? ''}:${query.group ?? false}:${query.logs ?? false}:${query.cursor ?? 'head'}:${query.limit}`,
                         store: c.get('store'),
                         ttl: Ttl.seconds(15),
                     });
@@ -1962,7 +1977,7 @@ export function addresses(options = {}) {
                     store: c.get('store'),
                     time: (name, fn) => Timing.sum(c, name, fn),
                 }), {
-                    key: `activities:zones:v6:${chainIds.join(',')}:${address.toLowerCase()}:${query.type.join(',')}:${query['amount.from'] ?? ''}:${query['amount.to'] ?? ''}:${query.recipient ?? ''}:${query.sender ?? ''}:${query.token ?? ''}:${query['valuation.amount.from'] ?? ''}:${query['valuation.amount.to'] ?? ''}:${query['valuation.currency'] ?? ''}:${query.group ?? false}:${query.logs ?? false}:${query.cursor ?? 'head'}:${query.limit}`,
+                    key: `activities:zones:v7:${chainIds.join(',')}:${address.toLowerCase()}:${query.type.join(',')}:${query['amount.from'] ?? ''}:${query['amount.to'] ?? ''}:${query.recipient ?? ''}:${query.sender ?? ''}:${query.token ?? ''}:${query['timestamp.from'] ?? ''}:${query['timestamp.to'] ?? ''}:${query['valuation.amount.from'] ?? ''}:${query['valuation.amount.to'] ?? ''}:${query['valuation.currency'] ?? ''}:${query.group ?? false}:${query.logs ?? false}:${query.cursor ?? 'head'}:${query.limit}`,
                     store: c.get('store'),
                     ttl: Ttl.seconds(15),
                 });
@@ -2469,9 +2484,55 @@ export function tidx(deps) {
             return undefined;
         return { blockNum: decoded[0], txIdx: decoded[1] };
     }
+    /**
+     * Resolves a timestamp window to the indexed blocks it spans, so every candidate
+     * scan can stop at a `block_num` floor. `null` means no indexed block falls inside it.
+     */
+    async function queryBlockRange(bounds) {
+        const blockNumber = (result) => Value.toNumber(result.rows[0]?.['num']);
+        const [from, to] = await time('address_activity_window', () => Promise.all([
+            bounds.from === undefined
+                ? undefined
+                : fetch({
+                    chainId,
+                    query: `
+                SELECT num
+                FROM blocks
+                WHERE timestamp >= '${bounds.from}'
+                ORDER BY num ASC
+                LIMIT 1
+              `,
+                }).then(blockNumber),
+            bounds.to === undefined
+                ? undefined
+                : fetch({
+                    chainId,
+                    query: `
+                SELECT num
+                FROM blocks
+                WHERE timestamp <= '${bounds.to}'
+                ORDER BY num DESC
+                LIMIT 1
+              `,
+                }).then(blockNumber),
+        ]));
+        if (bounds.from !== undefined && from === undefined)
+            return null;
+        if (bounds.to !== undefined && to === undefined)
+            return null;
+        if (from !== undefined && to !== undefined && from > to)
+            return null;
+        return {
+            ...(from !== undefined ? { from } : {}),
+            ...(to !== undefined ? { to } : {}),
+        };
+    }
     /** Q1 selects bounded outbound transactions, then reads their logs. */
     async function queryOutbound(options) {
-        const { address, cursor, limit } = options;
+        const { address, cursor, limit, range } = options;
+        const window = blockRangePredicates(range)
+            .map((predicate) => `AND ${predicate}`)
+            .join(' ');
         const receiptKeyset = cursor
             ? `AND block_num <= ${cursor.blockNum} AND (block_num < ${cursor.blockNum} OR tx_idx < ${cursor.txIdx})`
             : '';
@@ -2488,13 +2549,13 @@ export function tidx(deps) {
           WITH outbound_candidates AS (
             (SELECT hash AS tx_hash, block_num, block_timestamp, idx AS tx_idx, "from", fee_payer
              FROM txs
-             WHERE "from" = '${address}' ${txKeyset}
+             WHERE "from" = '${address}' ${window} ${txKeyset}
              ORDER BY block_num DESC, idx DESC
              LIMIT ${queryLimit})
             UNION
             (SELECT tx_hash, block_num, block_timestamp, tx_idx, "from", fee_payer
              FROM receipts
-             WHERE fee_payer = '${address}' ${receiptKeyset}
+             WHERE fee_payer = '${address}' ${window} ${receiptKeyset}
              ORDER BY block_num DESC, tx_idx DESC
              LIMIT ${queryLimit})
           )
@@ -2574,7 +2635,7 @@ export function tidx(deps) {
     }
     /** Q2 reads inbound and outbound `Transfer` logs in one request. */
     async function queryTransfers(options) {
-        const { address, cursor, filter, limit } = options;
+        const { address, cursor, filter, limit, range } = options;
         const keyset = cursor
             ? `AND (block_num < ${cursor.blockNum} OR (block_num = ${cursor.blockNum} AND tx_idx < ${cursor.txIdx}))`
             : '';
@@ -2586,6 +2647,7 @@ export function tidx(deps) {
         const materializedPredicate = [
             ...participantPredicates,
             ...(filter?.token !== undefined ? [`token = '${filter.token}'`] : []),
+            ...blockRangePredicates(range),
             ...(amount?.from !== undefined
                 ? amount.from > maxTokenAmount
                     ? ['0']
@@ -2600,6 +2662,7 @@ export function tidx(deps) {
         const decodedPredicate = [
             ...participantPredicates,
             ...(filter?.token !== undefined ? [`address = '${filter.token}'`] : []),
+            ...blockRangePredicates(range),
             ...(amount?.from !== undefined
                 ? amount.from > maxTokenAmount
                     ? ['0']
@@ -2828,14 +2891,26 @@ export function tidx(deps) {
         },
         async fetchRows({ address, cursor, filter, limit }) {
             const parsed = cursor ? parseCursor(cursor) : undefined;
+            const range = filter?.timestamp ? await queryBlockRange(filter.timestamp) : undefined;
+            if (range === null)
+                return { rows: [] };
             const [q1, q2] = await Promise.all([
-                queryOutbound({ address, cursor: parsed, limit }),
-                queryTransfers({ address, cursor: parsed, filter, limit }),
+                queryOutbound({ address, cursor: parsed, limit, range }),
+                queryTransfers({ address, cursor: parsed, filter, limit, range }),
             ]);
             return { rows: mergeAndSort(q1, q2, []) };
         },
     };
 }
+/** Builds inclusive `block_num` predicates for a candidate query. */
+function blockRangePredicates(range) {
+    if (!range)
+        return [];
+    return [
+        ...(range.from !== undefined ? [`block_num >= ${range.from}`] : []),
+        ...(range.to !== undefined ? [`block_num <= ${range.to}`] : []),
+    ];
+}
 /**
  * Merges three sub-query results into one `(blockNum desc, txIdx desc)` stream.
  * Q2/Q3 rows whose hash already appears in Q1 are dropped (Q1 rows are richer),