🐛 Fix event db key and restore index

LiskArchive · May 17, 2022 · 6f9f980 · 6f9f980
1 parent 71fba6d
commit 6f9f980
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/elements/lisk-chain/src/db_keys.ts b/elements/lisk-chain/src/db_keys.ts
@@ -19,7 +19,7 @@ export const DB_KEY_TRANSACTIONS_BLOCK_ID = Buffer.from([5]);
 export const DB_KEY_TRANSACTIONS_ID = Buffer.from([6]);
 export const DB_KEY_TEMPBLOCKS_HEIGHT = Buffer.from([7]);
 export const DB_KEY_BLOCK_ASSETS_BLOCK_ID = Buffer.from([8]);
-export const DB_KEY_BLOCK_EVENTS = Buffer.from([8]);
+export const DB_KEY_BLOCK_EVENTS = Buffer.from([9]);
 
 export const DB_KEY_STATE_STORE = Buffer.from([10]);
 

diff --git a/framework/src/node/state_machine/event_queue.ts b/framework/src/node/state_machine/event_queue.ts
@@ -68,7 +68,15 @@ export class EventQueue {
 
 	public restoreSnapshot(): void {
 		const newEvents = this._events.splice(this._snapshotIndex);
-		const nonRevertableEvents = newEvents.filter(eventData => eventData.noRevert);
+		const nonRevertableEvents = newEvents
+			.filter(eventData => eventData.noRevert)
+			.map((eventData, i) => ({
+				event: new Event({
+					...eventData.event.toObject(),
+					index: this._snapshotIndex + i,
+				}),
+				noRevert: false,
+			}));
 		this._events.push(...nonRevertableEvents);
 		this._snapshotIndex = -1;
 	}

diff --git a/framework/test/unit/node/state_machine/event_queue.spec.ts b/framework/test/unit/node/state_machine/event_queue.spec.ts
@@ -120,5 +120,10 @@ describe('EventQueue', () => {
 		eventQueue.restoreSnapshot();
 
 		expect(eventQueue.getEvents()).toHaveLength(events.length + 1);
+		const queuedEvents = eventQueue.getEvents();
+		// eslint-disable-next-line @typescript-eslint/prefer-for-of
+		for (let i = 0; i < queuedEvents.length; i += 1) {
+			expect(queuedEvents[i].toObject().index).toEqual(i);
+		}
 	});
 });