fix: abort if different bundle round was returned from api (#113)

KYVENetwork · Jan 3, 2024 · ccac962 · ccac962
1 parent 800d4a1
commit ccac962
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/common/protocol/src/methods/main/runNode.ts b/common/protocol/src/methods/main/runNode.ts
@@ -44,7 +44,7 @@ export async function runNode(this: Validator): Promise<void> {
       continue;
     }
 
-    // temp save proposal creation time to detect if a new proposal is
+    // temp save proposal creation time to detect if a different proposal is
     // available in the meantime
     const updatedAt = parseInt(this.pool.bundle_proposal!.updated_at);
 

diff --git a/common/protocol/src/methods/queries/canPropose.ts b/common/protocol/src/methods/queries/canPropose.ts
@@ -38,11 +38,11 @@ export async function canPropose(
               };
             }
 
-            // abort if a new bundle proposal was found
-            if (parseInt(this.pool.bundle_proposal!.updated_at) > updatedAt) {
+            // abort if a different bundle proposal was found
+            if (parseInt(this.pool.bundle_proposal!.updated_at) !== updatedAt) {
               return {
                 possible: false,
-                reason: "New bundle proposal was found",
+                reason: "Different bundle proposal was found",
               };
             }
 

diff --git a/common/protocol/src/methods/queries/canVote.ts b/common/protocol/src/methods/queries/canVote.ts
@@ -38,11 +38,11 @@ export async function canVote(
               };
             }
 
-            // abort if a new bundle proposal was found
-            if (parseInt(this.pool.bundle_proposal!.updated_at) > updatedAt) {
+            // abort if a different bundle proposal was found
+            if (parseInt(this.pool.bundle_proposal!.updated_at) !== updatedAt) {
               return {
                 possible: false,
-                reason: "New bundle proposal was found",
+                reason: "Different bundle proposal was found",
               };
             }
 

diff --git a/common/protocol/src/methods/timeouts/waitForCacheContinuation.ts b/common/protocol/src/methods/timeouts/waitForCacheContinuation.ts
@@ -15,7 +15,7 @@ export async function waitForCacheContinuation(
   this: Validator,
   updatedAt: number
 ): Promise<void> {
-  // continue if a new proposal is available
+  // continue if a different proposal is available
   while (updatedAt === parseInt(this.pool.bundle_proposal!.updated_at)) {
     await sleep(1000);
   }

diff --git a/common/protocol/src/methods/timeouts/waitForNextBundleProposal.ts b/common/protocol/src/methods/timeouts/waitForNextBundleProposal.ts
@@ -25,6 +25,8 @@ export async function waitForNextBundleProposal(
       this.m.bundles_wait_for_next_round_time.startTimer();
 
     // continue if the creation time of the bundle proposal increased
+    // we have an smaller equal check here, because we only want to continue,
+    // if we find a NEW bundle proposal
     while (parseInt(this.pool.bundle_proposal!.updated_at) <= updatedAt) {
       await this.syncPoolState();
 

diff --git a/common/protocol/src/methods/validate/saveBundleDownload.ts b/common/protocol/src/methods/validate/saveBundleDownload.ts
@@ -35,8 +35,8 @@ export async function saveBundleDownload(
         .plus(this.pool.data!.upload_interval)
         .multipliedBy(1000);
 
-      // check if new proposal is available in the meantime
-      if (parseInt(this.pool.bundle_proposal!.updated_at) > updatedAt) {
+      // check if different proposal is available in the meantime
+      if (parseInt(this.pool.bundle_proposal!.updated_at) !== updatedAt) {
         return null;
       }
 

diff --git a/common/protocol/src/methods/validate/saveLoadValidationBundle.ts b/common/protocol/src/methods/validate/saveLoadValidationBundle.ts
@@ -31,8 +31,8 @@ export async function saveLoadValidationBundle(
         .plus(this.pool.data!.upload_interval)
         .multipliedBy(1000);
 
-      // check if new proposal is available in the meantime
-      if (parseInt(this.pool.bundle_proposal!.updated_at) > updatedAt) {
+      // check if different proposal is available in the meantime
+      if (parseInt(this.pool.bundle_proposal!.updated_at) !== updatedAt) {
         return null;
       }