Merge pull request #5407 from connext/testnet-prod

main <- testnet prod sync
connext · Dec 20, 2023 · 2f22c5a · 2f22c5a
2 parents e2a7f5a + 5199fe4
commit 2f22c5a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/packages/adapters/database/src/client.ts b/packages/adapters/database/src/client.ts
@@ -1150,7 +1150,7 @@ export const getCurrentProposedOptimisticRoot = async (
     .selectOne(
       "spoke_optimistic_roots",
       { domain, status: "Proposed" },
-      { limit: 1, order: { by: "root_timestamp", direction: "DESC" } },
+      { limit: 1, order: { by: "end_of_dispute", direction: "DESC" } },
     )
     .run(poolToUse);
   return opRoot ? convertFromDbSpokeOptimisticRoot(opRoot) : undefined;

diff --git a/packages/adapters/database/test/client.spec.ts b/packages/adapters/database/test/client.spec.ts
@@ -1746,6 +1746,7 @@ describe("Database client", () => {
       m.id = `${_i}`;
       m.rootTimestamp = _i;
       m.proposeTimestamp = _i;
+      m.endOfDispute = _i;
       spokeOptimisticRoots.push(m);
     }
     await saveProposedSpokeRoots(spokeOptimisticRoots, pool);

diff --git a/packages/adapters/subgraph/src/lib/operations/queries.ts b/packages/adapters/subgraph/src/lib/operations/queries.ts
@@ -1138,7 +1138,7 @@ export const getProposedSnapshotsByDomainQuery = (
 };
 
 export const getProposedSpokeOptimisticRootsByDomainQuery = (
-  params: { domain: string; rootTimestamp: number; limit: number; maxBlockNumber: number }[],
+  params: { domain: string; proposeTimestamp: number; limit: number; maxBlockNumber: number }[],
 ) => {
   const { config } = getContext();
   let combinedQuery = "";
@@ -1148,10 +1148,10 @@ export const getProposedSpokeOptimisticRootsByDomainQuery = (
     ${prefix}_aggregateRootProposeds ( 
       first: ${param.limit}, 
       where: { 
-        rootTimestamp_gt: ${param.rootTimestamp},
+        timestamp_gt: ${param.proposeTimestamp},
         blockNumber_lte: ${param.maxBlockNumber}
       }
-      orderBy: rootTimestamp,
+      orderBy: timestamp,
       orderDirection: asc
     ) {
       ${SPOKE_OPTIMISTIC_ROOT_ENTITY}

diff --git a/packages/adapters/subgraph/src/reader.ts b/packages/adapters/subgraph/src/reader.ts
@@ -896,7 +896,7 @@ export class SubgraphReader {
    * Gets proposed spoke optimistic roots
    */
   public async getProposedSpokeOptimisticRootsByDomain(
-    params: { domain: string; rootTimestamp: number; limit: number; maxBlockNumber: number }[],
+    params: { domain: string; proposeTimestamp: number; limit: number; maxBlockNumber: number }[],
   ): Promise<SpokeOptimisticRoot[]> {
     const { parser, execute } = getHelpers();
     const proposedSpokeOptimisticRootsByDomainQuery = getProposedSpokeOptimisticRootsByDomainQuery(params);

diff --git a/packages/agents/cartographer/poller/src/lib/operations/roots.ts b/packages/agents/cartographer/poller/src/lib/operations/roots.ts
@@ -126,27 +126,27 @@ export const updateProposedSpokeOptimisticRoot = async (maxBlockNumbers: Map<str
       continue;
     }
 
-    const rootTimestamp = await database.getCheckPoint("proposed_optimistic_root_" + domain);
+    const proposeTimestamp = await database.getCheckPoint("proposed_optimistic_root_" + domain);
     const limit = 100;
     logger.debug("Retrieving proposed optimistic root for spoke", requestContext, methodContext, {
       domain,
-      rootTimestamp: rootTimestamp,
+      proposeTimestamp: proposeTimestamp,
       limit: limit,
     });
 
     const opRoots: SpokeOptimisticRoot[] = await subgraph.getProposedSpokeOptimisticRootsByDomain([
-      { domain, rootTimestamp, limit, maxBlockNumber },
+      { domain, proposeTimestamp, limit, maxBlockNumber },
     ]);
 
-    const newRootTimestamp =
-      opRoots.length == 0 ? 0 : opRoots.sort((a, b) => b.rootTimestamp - a.rootTimestamp)[0].rootTimestamp;
-    if (rootTimestamp === 0 || newRootTimestamp > rootTimestamp) {
+    const newProposeTimestamp =
+      opRoots.length == 0 ? 0 : opRoots.sort((a, b) => b.proposeTimestamp! - a.proposeTimestamp!)[0].proposeTimestamp!;
+    if (proposeTimestamp === 0 || newProposeTimestamp > proposeTimestamp) {
       await database.saveProposedSpokeRoots(opRoots);
 
-      await database.saveCheckPoint("proposed_optimistic_root_" + domain, newRootTimestamp);
+      await database.saveCheckPoint("proposed_optimistic_root_" + domain, newProposeTimestamp);
       logger.debug("Saved proposed optimistic root for spoke", requestContext, methodContext, {
         domain,
-        rootTimestamp: newRootTimestamp,
+        proposeTimestamp: newProposeTimestamp,
       });
     }
   }

diff --git a/packages/agents/lighthouse/src/tasks/propose/operations/proposeHub.ts b/packages/agents/lighthouse/src/tasks/propose/operations/proposeHub.ts
@@ -76,7 +76,7 @@ export const proposeHub = async () => {
   const latestSnapshotTimestamp = latestSnapshotId * config.snapshotDuration;
 
   const timeSinceSnapshotStart = currentTimestamp - latestSnapshotTimestamp;
-  const waitTime = config.snapshotDuration / 3;
+  const waitTime = Math.floor(config.snapshotDuration / 3);
   if (timeSinceSnapshotStart < waitTime) {
     // Exit if earlier than 1/3 of the snapshot duration to help accommodate time boundary conditions
     logger.info("Skipping ProposeHub. Wait time not completed", requestContext, methodContext, {

diff --git a/packages/utils/src/mocks/mock.ts b/packages/utils/src/mocks/mock.ts
@@ -706,5 +706,5 @@ export const mock = {
       },
     },
   },
-  snapshotDuration: 1800,
+  snapshotDuration: 1,
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -706,5 +706,5 @@ export const mock = { @@
           },
         },
       },
-      snapshotDuration: 1800,
+      snapshotDuration: 1,
     };