Replace epochTime with genesis block timestamp - Closes #5280

elements/lisk-bft/src/bft.ts

@@ -149,7 +149,7 @@ export class BFT extends EventEmitter {
 		// Current time since Lisk Epoch
 		const receivedBlock = {
 			...blockHeader,
-			receivedAt: this._chain.slots.getEpochTime(),
+			receivedAt: this._chain.slots.timeSinceGenesis(),
 		};
 
 		/* Cases are numbered following LIP-0014 Fork choice rule.

elements/lisk-bft/src/types.ts

@@ -55,7 +55,7 @@ export interface Chain {
 			slotNumber: number,
 			receivedAt: number | undefined,
 		) => boolean;
-		readonly getEpochTime: (time?: number) => number;
+		readonly timeSinceGenesis: (time?: number) => number;
 	};
 }
 

elements/lisk-bft/test/protocol_specs/bft_finality_manager_protocol_specs.spec.ts

@@ -50,7 +50,7 @@ describe('FinalityManager', () => {
 		slots: {
 			getSlotNumber: jest.Mock;
 			isWithinTimeslot: jest.Mock;
-			getEpochTime: jest.Mock;
+			timeSinceGenesis: jest.Mock;
 		};
 	};
 	let dposStub: {
@@ -74,7 +74,7 @@ describe('FinalityManager', () => {
 						slots: {
 							getSlotNumber: jest.fn(),
 							isWithinTimeslot: jest.fn(),
-							getEpochTime: jest.fn(),
+							timeSinceGenesis: jest.fn(),
 						},
 					};
 					dposStub = {
@@ -158,7 +158,7 @@ describe('FinalityManager', () => {
 					slots: {
 						getSlotNumber: jest.fn(),
 						isWithinTimeslot: jest.fn(),
-						getEpochTime: jest.fn(),
+						timeSinceGenesis: jest.fn(),
 					},
 				};
 				dposStub = {
@@ -278,7 +278,7 @@ describe('FinalityManager', () => {
 					slots: {
 						getSlotNumber: jest.fn(),
 						isWithinTimeslot: jest.fn(),
-						getEpochTime: jest.fn(),
+						timeSinceGenesis: jest.fn(),
 					},
 				};
 				dposStub = {

elements/lisk-bft/test/protocol_specs/bft_fork_choice_rules_protocol_specs.spec.ts

@@ -20,7 +20,6 @@ import forkChoiceSpecs = require('../bft_specs/bft_fork_choice_rules.json');
 
 const constants = {
 	ACTIVE_DELEGATES: 101,
-	EPOCH_TIME: '2016-05-24T17:00:00.000Z',
 	BLOCK_TIME: 10,
 };
 
@@ -45,7 +44,7 @@ describe('bft', () => {
 
 		beforeEach(() => {
 			const slots = new Slots({
-				epochTime: constants.EPOCH_TIME,
+				genesisBlockTimestamp: 0,
 				interval: constants.BLOCK_TIME,
 			});
 			chainStub = {
@@ -77,22 +76,24 @@ describe('bft', () => {
 			forkChoiceSpecs.testCases.forEach((testCase: any) => {
 				describe(testCase.description, () => {
 					it('should have accurate fork status', () => {
-						const epochTime = testCase.config
-							? testCase.config.epochTime
-							: forkChoiceSpecs.config.epochTime;
+						const genesisBlockTimestamp = 0;
 						const interval = testCase.config
 							? testCase.config.blockInterval
 							: forkChoiceSpecs.config.blockInterval;
 						const lastBlock = testCase.config
 							? testCase.config.lastBlock
 							: forkChoiceSpecs.config.lastBlock;
 
-						(chainStub.slots as any)._epochTime = new Date(epochTime);
+						(chainStub.slots as any)._genesisTime = new Date(
+							genesisBlockTimestamp,
+						);
 						(chainStub.slots as any)._interval = interval;
 
 						Date.now = jest.fn(
 							// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-							() => epochTime + testCase.input.receivedBlock.receivedAt * 1000,
+							() =>
+								genesisBlockTimestamp +
+								testCase.input.receivedBlock.receivedAt * 1000,
 						);
 
 						const {

elements/lisk-bft/test/protocol_specs/bft_invalid_block_headers_protocol_specs.spec.ts

@@ -28,7 +28,7 @@ describe('FinalityManager', () => {
 			slots: {
 				getSlotNumber: jest.Mock;
 				isWithinTimeslot: jest.Mock;
-				getEpochTime: jest.Mock;
+				timeSinceGenesis: jest.Mock;
 			};
 		};
 		let dposStub: {
@@ -46,7 +46,7 @@ describe('FinalityManager', () => {
 				slots: {
 					getSlotNumber: jest.fn(),
 					isWithinTimeslot: jest.fn(),
-					getEpochTime: jest.fn(),
+					timeSinceGenesis: jest.fn(),
 				},
 			};
 			dposStub = {

elements/lisk-bft/test/unit/bft.spec.ts

@@ -68,7 +68,7 @@ describe('bft', () => {
 			slots: {
 				getSlotNumber: jest.Mock;
 				isWithinTimeslot: jest.Mock;
-				getEpochTime: jest.Mock;
+				timeSinceGenesis: jest.Mock;
 			};
 		};
 		let dposStub: {
@@ -89,7 +89,7 @@ describe('bft', () => {
 				slots: {
 					getSlotNumber: jest.fn(),
 					isWithinTimeslot: jest.fn(),
-					getEpochTime: jest.fn(),
+					timeSinceGenesis: jest.fn(),
 				},
 			};
 

elements/lisk-bft/test/unit/finality_manager.spec.ts

@@ -52,7 +52,7 @@ describe('finality_manager', () => {
 			slots: {
 				getSlotNumber: jest.Mock;
 				isWithinTimeslot: jest.Mock;
-				getEpochTime: jest.Mock;
+				timeSinceGenesis: jest.Mock;
 			};
 		};
 		let dposStub: {
@@ -69,7 +69,7 @@ describe('finality_manager', () => {
 				slots: {
 					getSlotNumber: jest.fn(),
 					isWithinTimeslot: jest.fn(),
-					getEpochTime: jest.fn(),
+					timeSinceGenesis: jest.fn(),
 				},
 			};
 

elements/lisk-bft/test/unit/fork_choice_rule.spec.ts

@@ -23,30 +23,30 @@ import {
 } from '../../src/fork_choice_rule';
 import { BlockHeader } from '../../src/types';
 
-const EPOCH_TIME = new Date(Date.UTC(2016, 4, 24, 17, 0, 0, 0)).toISOString();
+const GENESIS_BLOCK_TIME_STAMP =
+	new Date(Date.UTC(2016, 4, 24, 17, 0, 0, 0)).getTime() / 1000;
 const BLOCK_TIME = 10;
 
-const createBlock = (data?: Partial<BlockHeader>): BlockHeader =>
-	({
-		height: data?.height ?? 0,
-		timestamp: data?.timestamp ?? 0,
-		version: 2,
-		id: data?.id ?? Buffer.from('id'),
-		generatorPublicKey: Buffer.from('generator'),
-		previousBlockID: data?.previousBlockID ?? Buffer.from('previoud block'),
-		receivedAt: data?.receivedAt ?? 0,
-		asset: {
-			maxHeightPrevoted: data?.asset?.maxHeightPrevoted ?? 0,
-			maxHeightPreviouslyForged: data?.asset?.maxHeightPreviouslyForged ?? 0,
-		},
-	});
+const createBlock = (data?: Partial<BlockHeader>): BlockHeader => ({
+	height: data?.height ?? 0,
+	timestamp: data?.timestamp ?? 0,
+	version: 2,
+	id: data?.id ?? Buffer.from('id'),
+	generatorPublicKey: Buffer.from('generator'),
+	previousBlockID: data?.previousBlockID ?? Buffer.from('previoud block'),
+	receivedAt: data?.receivedAt ?? 0,
+	asset: {
+		maxHeightPrevoted: data?.asset?.maxHeightPrevoted ?? 0,
+		maxHeightPreviouslyForged: data?.asset?.maxHeightPreviouslyForged ?? 0,
+	},
+});
 
 describe('Fork Choice Rule', () => {
 	let slots: Slots;
 
 	beforeEach(() => {
 		slots = new Slots({
-			epochTime: EPOCH_TIME,
+			genesisBlockTimestamp: GENESIS_BLOCK_TIME_STAMP,
 			interval: BLOCK_TIME,
 		});
 	});

elements/lisk-chain/src/chain.ts

@@ -86,7 +86,6 @@ interface ChainConstructor {
 		default: object;
 	};
 	// Constants
-	readonly epochTime: string;
 	readonly blockTime: number;
 	readonly networkIdentifier: Buffer;
 	readonly maxPayloadLength: number;
@@ -119,7 +118,6 @@ export class Chain {
 	private readonly _genesisBlock: Block;
 	private readonly constants: {
 		readonly stateBlockSize: number;
-		readonly epochTime: string;
 		readonly blockTime: number;
 		readonly maxPayloadLength: number;
 	};
@@ -134,7 +132,6 @@ export class Chain {
 		accountAsset,
 		registeredTransactions,
 		// Constants
-		epochTime,
 		blockTime,
 		networkIdentifier,
 		maxPayloadLength,
@@ -183,7 +180,10 @@ export class Chain {
 		this._lastBlock = genesisBlock;
 		this._networkIdentifier = networkIdentifier;
 		this._genesisBlock = genesisBlock;
-		this.slots = new Slots({ epochTime, interval: blockTime });
+		this.slots = new Slots({
+			genesisBlockTimestamp: genesisBlock.header.timestamp,
+			interval: blockTime,
+		});
 		this.blockRewardArgs = {
 			distance: rewardDistance,
 			rewardOffset,
@@ -200,7 +200,6 @@ export class Chain {
 		};
 		this.constants = {
 			stateBlockSize,
-			epochTime,
 			blockTime,
 			maxPayloadLength,
 		};

elements/lisk-chain/src/slots.ts

@@ -13,45 +13,43 @@
  */
 
 interface SlotsInput {
-	readonly epochTime: string;
+	readonly genesisBlockTimestamp: number;
 	readonly interval: number;
 }
 
 const SEC_IN_MS = 1000;
 
 export class Slots {
-	private readonly _epochTime: Date;
+	private readonly _genesisTime: number;
 	private readonly _interval: number;
 
-	public constructor({ epochTime, interval }: SlotsInput) {
-		this._epochTime = new Date(epochTime);
+	public constructor({ genesisBlockTimestamp, interval }: SlotsInput) {
+		this._genesisTime = genesisBlockTimestamp;
 		this._interval = interval;
 	}
 
-	public getEpochTime(): number {
-		return Math.floor((Date.now() - this._epochTime.getTime()) / SEC_IN_MS);
+	public timeSinceGenesis(): number {
+		return Math.floor((Date.now() - this._genesisTime * SEC_IN_MS) / SEC_IN_MS);
 	}
 
 	public blockTime(): number {
 		return this._interval;
 	}
 
-	public getRealTime(time: number): number {
-		return (
-			Math.floor(this._epochTime.getTime() / SEC_IN_MS) * SEC_IN_MS +
-			time * SEC_IN_MS
+	public getSlotNumber(timeStamp?: number): number {
+		const elapsedTime = Math.floor(
+			((timeStamp !== undefined ? timeStamp * SEC_IN_MS : Date.now()) -
+				this._genesisTime * SEC_IN_MS) /
+				SEC_IN_MS,
 		);
-	}
-
-	public getSlotNumber(epochTime?: number): number {
-		const parsedEpochTime =
-			epochTime === undefined ? this.getEpochTime() : epochTime;
 
-		return Math.floor(parsedEpochTime / this._interval);
+		return Math.floor(elapsedTime / this._interval);
 	}
 
 	public getSlotTime(slot: number): number {
-		return slot * this._interval;
+		const slotGensisTimeOffset = slot * this._interval;
+
+		return this._genesisTime + slotGensisTimeOffset;
 	}
 
 	public getNextSlot(): number {