fix(core-database): allow legacy transaction in getBlocksForRound (#3…

…372) * fix: allow legacy transaction in getBlocksForRound use deserializeTransactionsUnchecked option to disable checks (as we get the block and txs from our own db)
compendia · Jan 6, 2020 · 16446a1 · 16446a1
1 parent 4d5b365
commit 16446a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/__tests__/unit/crypto/blocks/factory.test.ts b/__tests__/unit/crypto/blocks/factory.test.ts
@@ -37,6 +37,16 @@ describe("BlockFactory", () => {
             expectBlock(BlockFactory.fromData(dummyBlock));
         });
 
+        it("should create a block instance when aip11 is true, block transactions are v1, and option deserializeTransactionsUnchecked is true", () => {
+            const milestone = configManager.getMilestone();
+            const spyGetMilestone = jest.spyOn(configManager, "getMilestone").mockReturnValue({
+                ...milestone,
+                aip11: true
+            });
+            expectBlock(BlockFactory.fromData(dummyBlock, { deserializeTransactionsUnchecked: true }));
+            spyGetMilestone.mockRestore();
+        });
+
         it("should create a block with exceptions", () => {
             // @ts-ignore
             expect(() => BlockFactory.fromData(blockWithExceptions)).not.toThrow();

diff --git a/packages/core-database/src/database-service.ts b/packages/core-database/src/database-service.ts
@@ -350,7 +350,7 @@ export class DatabaseService implements Database.IDatabaseService {
                         .getGenesisBlock();
                 }
 
-                return Blocks.BlockFactory.fromData(block);
+                return Blocks.BlockFactory.fromData(block, { deserializeTransactionsUnchecked: true });
             },
         );
     }