Merge pull request #94 from reservoirprotocol/block-fixes

feat: fix rounding issues
reservoirprotocol · Nov 7, 2023 · 53ebb29 · 53ebb29
2 parents 564fe71 + d8d1240
commit 53ebb29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reservoir-sync-node",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "scripts": {
     "start": " yarn database:prepare && yarn build && yarn build:viewer && yarn move && node dist/index.js",
     "build": "yarn run clean && tsc",

diff --git a/src/syncer/Controller.ts b/src/syncer/Controller.ts
@@ -280,8 +280,8 @@ export class Controller {
     return {
       id: v4(),
       priority: 1,
-      startDate: reqs[0].data[root][reqs[0].data[root].length - 1].updatedAt,
-      endDate: reqs[1].data[root][reqs[1].data[root].length - 1].updatedAt,
+      startDate: reqs[1].data[root][reqs[1].data[root].length - 1].updatedAt,
+      endDate: reqs[0].data[root][reqs[0].data[root].length - 1].updatedAt,
       contract: contract || "",
     };
   }

diff --git a/src/syncer/Worker.ts b/src/syncer/Worker.ts
@@ -95,8 +95,8 @@ export class Worker extends EventEmitter {
       const ascRes = await this._request(
         this._normalize({
           ...(contract && { contract: contract }),
-          startTimestamp: parseTimestamp(startDate),
-          endTimestamp: parseTimestamp(endDate),
+          startTimestamp: parseTimestamp(startDate, false),
+          endTimestamp: parseTimestamp(endDate, true),
           sortDirection: "asc",
         })
       );
@@ -123,8 +123,8 @@ export class Worker extends EventEmitter {
         const descRes = await this._request(
           this._normalize({
             ...(contract && { contract: contract }),
-            startTimestamp: parseTimestamp(startDate),
-            endTimestamp: parseTimestamp(endDate),
+            startTimestamp: parseTimestamp(startDate, false),
+            endTimestamp: parseTimestamp(endDate, true),
             sortDirection: "desc",
           })
         );
@@ -185,8 +185,8 @@ export class Worker extends EventEmitter {
         this._normalize({
           ...(this.continuation && { continuation: this.continuation }),
           sortDirection: "asc",
-          startTimestamp: parseTimestamp(startDate),
-          endTimestamp: parseTimestamp(endDate),
+          startTimestamp: parseTimestamp(startDate, false),
+          endTimestamp: parseTimestamp(endDate, true),
         })
       );
 
@@ -232,7 +232,7 @@ export class Worker extends EventEmitter {
           {
             ...(this.continuation && { continuation: this.continuation }),
             sortDirection: "asc",
-            startTimestamp: parseTimestamp(startDate),
+            startTimestamp: parseTimestamp(startDate, false),
             endTimestamp: END_OF_TIME,
           },
           false
@@ -254,7 +254,7 @@ export class Worker extends EventEmitter {
           {
             ...(this.continuation && { continuation: this.continuation }),
             sortDirection: "desc",
-            startTimestamp: parseTimestamp(startDate),
+            startTimestamp: parseTimestamp(startDate, false),
             endTimestamp: END_OF_TIME,
           },
           false

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -59,17 +59,20 @@ export const isErrorResponse = (
   return r.status !== 200;
 };
 
-export function parseTimestamp(date: string): number {
+export function parseTimestamp(date: string, isEndTime: boolean): number {
   const datePieces = date.split("T");
   const [year, month, day] = datePieces[0].split("-").map(Number);
 
   const timePieces = datePieces[1].substring(0, 8).split(":").map(Number);
   const [hour, minute, second] = timePieces;
 
+  const timeAdjustment = isEndTime ? 5000 : -5000;
+
   const startDate = new Date(year, month - 1, day, hour, minute, second);
 
   const timezoneOffset = startDate.getTimezoneOffset() * 60 * 1000;
-  return (startDate.getTime() - timezoneOffset) / 1000;
+
+  return (startDate.getTime() - timezoneOffset + timeAdjustment) / 1000;
 }
 
 /**