fix(core-forger): also check if still in same slot (#2792)

ArkEcosystem · Jul 10, 2019 · ec68d39 · ec68d39
1 parent 766870e
commit ec68d39
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/__tests__/unit/core-forger/manager.test.ts b/__tests__/unit/core-forger/manager.test.ts
@@ -48,7 +48,7 @@ describe("Forger Manager", () => {
             const del = new Delegate("a secret", testnet.network);
             const round = {
                 lastBlock: { id: sampleBlock.data.id, height: sampleBlock.data.height },
-                timestamp: 1,
+                timestamp: Crypto.Slots.getTime(),
                 reward: 2 * 1e8,
             };
 
@@ -92,7 +92,7 @@ describe("Forger Manager", () => {
             const del = new Delegate("a secret", testnet.network);
             const round = {
                 lastBlock: { id: sampleBlock.data.id, height: sampleBlock.data.height },
-                timestamp: 1,
+                timestamp: Crypto.Slots.getTime(),
                 reward: 2 * 1e8,
             };
 
@@ -115,6 +115,20 @@ describe("Forger Manager", () => {
             });
 
             expect(forgeManager.client.broadcastBlock).not.toHaveBeenCalled();
+
+            jest.resetAllMocks();
+
+            jest.spyOn(Crypto.Slots, "getTimeInMsUntilNextSlot").mockReturnValueOnce(2000);
+            jest.spyOn(Crypto.Slots, "getSlotNumber").mockImplementation(timestamp => {
+                return timestamp === undefined ? 1 : 2;
+            });
+
+            await forgeManager.forgeNewBlock(del, round, {
+                lastBlockId: round.lastBlock.id,
+                nodeHeight: round.lastBlock.height,
+            });
+
+            expect(forgeManager.client.broadcastBlock).not.toHaveBeenCalled();
         });
     });
 

diff --git a/packages/core-forger/src/manager.ts b/packages/core-forger/src/manager.ts
@@ -155,12 +155,12 @@ export class ForgerManager {
 
         const minimumMs: number = 2000;
         const timeLeftInMs: number = Crypto.Slots.getTimeInMsUntilNextSlot();
-        if (timeLeftInMs >= minimumMs) {
-            this.logger.info(
-                `Forged new block ${block.data.id} by delegate ${this.usernames[delegate.publicKey]} (${
-                    delegate.publicKey
-                })`,
-            );
+        const currentSlot: number = Crypto.Slots.getSlotNumber();
+        const roundSlot: number = Crypto.Slots.getSlotNumber(round.timestamp);
+        const prettyName: string = `${this.usernames[delegate.publicKey]} (${delegate.publicKey})`;
+
+        if (timeLeftInMs >= minimumMs && currentSlot === roundSlot) {
+            this.logger.info(`Forged new block ${block.data.id} by delegate ${prettyName}`);
 
             await this.client.broadcastBlock(block.toJson());
 
@@ -170,11 +170,13 @@ export class ForgerManager {
                 this.client.emitEvent(ApplicationEvents.TransactionForged, transaction);
             }
         } else {
-            this.logger.warn(
-                `Failed to forge new block by delegate ${this.usernames[delegate.publicKey]} (${
-                    delegate.publicKey
-                }, because there were less than ${minimumMs}ms left`,
-            );
+            if (currentSlot !== roundSlot) {
+                this.logger.warn(`Failed to forge new block by delegate ${prettyName}, because already in next slot.`);
+            } else {
+                this.logger.warn(
+                    `Failed to forge new block by delegate ${prettyName}, because there were ${timeLeftInMs}ms left in the current slot (less than ${minimumMs}ms).`,
+                );
+            }
         }
     }