Hash block header with strategy class (#4533)

iron-fish · Jan 11, 2024 · f08d5bb · f08d5bb
1 parent cf5202a
commit f08d5bb
Show file tree

Hide file tree

Showing 22 changed files with 176 additions and 130 deletions.
diff --git a/ironfish/src/blockchain/blockchain.test.ts b/ironfish/src/blockchain/blockchain.test.ts
@@ -435,7 +435,7 @@ describe('Blockchain', () => {
     const genesis = nodeTest.chain.genesis
     expect(node.chain.head?.hash).toEqualBuffer(genesis.hash)
 
-    const blockB3Invalid = Block.fromRaw({
+    const blockB3Invalid = nodeTest.strategy.newBlock({
       header: {
         ...blockB3.header,
         noteCommitment: Buffer.alloc(32),
@@ -731,7 +731,7 @@ describe('Blockchain', () => {
       valid: true,
     })
 
-    const invalidBlock = Block.fromRaw({
+    const invalidBlock = nodeTest.strategy.newBlock({
       header: {
         ...block.header,
         timestamp: new Date(0),

diff --git a/ironfish/src/blockchain/blockchain.ts b/ironfish/src/blockchain/blockchain.ts
@@ -200,7 +200,7 @@ export class Blockchain {
   }
 
   private async seed() {
-    const genesis = BlockSerde.deserialize(this.seedGenesisBlock)
+    const genesis = BlockSerde.deserialize(this.seedGenesisBlock, this.strategy)
 
     const result = await this.addBlock(genesis)
     Assert.isTrue(result.isAdded, `Could not seed genesis: ${result.reason || 'unknown'}`)
@@ -230,7 +230,7 @@ export class Blockchain {
     if (genesisHeader) {
       Assert.isTrue(
         genesisHeader.hash.equals(
-          BlockHeaderSerde.deserialize(this.seedGenesisBlock.header).hash,
+          BlockHeaderSerde.deserialize(this.seedGenesisBlock.header, this.strategy).hash,
         ),
         'Genesis block in network definition does not match existing chain genesis block',
       )
@@ -948,7 +948,7 @@ export class Blockchain {
         graffiti,
       }
 
-      const header = new BlockHeader(rawHeader, noteSize, BigInt(0))
+      const header = this.strategy.newBlockHeader(rawHeader, noteSize, BigInt(0))
 
       const block = new Block(header, transactions)
       if (verifyBlock && !previousBlockHash.equals(GENESIS_BLOCK_PREVIOUS)) {

diff --git a/ironfish/src/blockchain/database/headers.ts b/ironfish/src/blockchain/database/headers.ts
@@ -63,7 +63,7 @@ export class HeaderEncoding implements IDatabaseEncoding<HeaderValue> {
       timestamp: new Date(timestamp),
       graffiti,
     }
-    const header = new BlockHeader(rawHeader, noteSize, work, hash)
+    const header = new BlockHeader(rawHeader, hash, noteSize, work)
 
     return { header }
   }

diff --git a/ironfish/src/consensus/verifier.test.ts b/ironfish/src/consensus/verifier.test.ts
@@ -199,7 +199,7 @@ describe('Verifier', () => {
       const { block } = await useBlockWithTx(nodeTest.node)
 
       const reorderedTransactions = [block.transactions[1], block.transactions[0]]
-      const invalidBlock = Block.fromRaw({
+      const invalidBlock = nodeTest.strategy.newBlock({
         header: {
           ...block.header,
           transactionCommitment: transactionCommitment(reorderedTransactions),
@@ -219,7 +219,7 @@ describe('Verifier', () => {
       const minersFee = await useMinersTxFixture(nodeTest.node, account, undefined, 0)
 
       const reorderedTransactions = [block.transactions[0], minersFee]
-      const invalidBlock = Block.fromRaw({
+      const invalidBlock = nodeTest.strategy.newBlock({
         header: {
           ...block.header,
           transactionCommitment: transactionCommitment(reorderedTransactions),
@@ -272,7 +272,7 @@ describe('Verifier', () => {
         },
       )
 
-      const invalidMinersBlock = Block.fromRaw({
+      const invalidMinersBlock = nodeTest.strategy.newBlock({
         header: {
           ...minersBlock.header,
           transactionCommitment: transactionCommitment([invalidMinersTransaction]),
@@ -289,7 +289,7 @@ describe('Verifier', () => {
     it('rejects a block with no transactions', async () => {
       const block = await useMinerBlockFixture(nodeTest.node.chain)
 
-      const invalidBlock = Block.fromRaw({
+      const invalidBlock = nodeTest.strategy.newBlock({
         header: {
           ...block.header,
           transactionCommitment: transactionCommitment([]),
@@ -316,7 +316,7 @@ describe('Verifier', () => {
 
       const invalidTransactions = [...block.transactions, extraTransaction]
 
-      const invalidBlock = Block.fromRaw({
+      const invalidBlock = nodeTest.strategy.newBlock({
         header: {
           ...block.header,
           transactionCommitment: transactionCommitment(invalidTransactions),
@@ -524,9 +524,9 @@ describe('Verifier', () => {
           ...header,
           graffiti: Buffer.alloc(31),
         },
+        header.hash,
         header.noteSize,
         header.work,
-        header.hash,
       )
 
       expect(nodeTest.verifier.verifyBlockHeader(invalidHeader31Byte)).toMatchObject({
@@ -539,9 +539,9 @@ describe('Verifier', () => {
           ...header,
           graffiti: Buffer.alloc(33),
         },
+        header.hash,
         header.noteSize,
         header.work,
-        header.hash,
       )
 
       expect(nodeTest.verifier.verifyBlockHeader(invalidHeader33Byte)).toMatchObject({
@@ -639,7 +639,7 @@ describe('Verifier', () => {
       nodeTest.verifier.enableVerifyTarget = true
       const block = await useMinerBlockFixture(nodeTest.chain)
 
-      const invalidHeader = new BlockHeader({
+      const invalidHeader = nodeTest.strategy.newBlockHeader({
         ...block.header,
         target: Target.minTarget(),
       })
@@ -655,7 +655,7 @@ describe('Verifier', () => {
     it('Is invalid when the sequence is wrong', async () => {
       const block = await useMinerBlockFixture(nodeTest.chain)
 
-      const invalidHeader = new BlockHeader({
+      const invalidHeader = nodeTest.strategy.newBlockHeader({
         ...block.header,
         sequence: 9999,
       })
@@ -692,7 +692,7 @@ describe('Verifier', () => {
       })
 
       it('fails validation when timestamp is too low', async () => {
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(
             prevHeader.timestamp.getTime() -
@@ -713,7 +713,7 @@ describe('Verifier', () => {
           .spyOn(global.Date, 'now')
           .mockImplementationOnce(() => prevHeader.timestamp.getTime() + 40 * 1000)
 
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(
             prevHeader.timestamp.getTime() +
@@ -734,7 +734,7 @@ describe('Verifier', () => {
           .spyOn(global.Date, 'now')
           .mockImplementationOnce(() => prevHeader.timestamp.getTime() + 1 * 1000)
 
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(prevHeader.timestamp.getTime() - 1 * 1000),
         })
@@ -751,7 +751,7 @@ describe('Verifier', () => {
           .spyOn(global.Date, 'now')
           .mockImplementationOnce(() => prevHeader.timestamp.getTime() + 1 * 1000)
 
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(prevHeader.timestamp.getTime() + 1 * 1000),
         })
@@ -792,7 +792,7 @@ describe('Verifier', () => {
       })
 
       it('fails validation when timestamp is too low', async () => {
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(
             prevHeader.timestamp.getTime() -
@@ -813,7 +813,7 @@ describe('Verifier', () => {
           .spyOn(global.Date, 'now')
           .mockImplementationOnce(() => prevHeader.timestamp.getTime() + 40 * 1000)
 
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(
             prevHeader.timestamp.getTime() +
@@ -830,7 +830,7 @@ describe('Verifier', () => {
       })
 
       it('fails validation when timestamp is smaller than previous block', async () => {
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(prevHeader.timestamp.getTime() - 1 * 1000),
         })
@@ -844,7 +844,7 @@ describe('Verifier', () => {
       })
 
       it('fails validation when timestamp is same as previous block', async () => {
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(prevHeader.timestamp.getTime()),
         })
@@ -862,7 +862,7 @@ describe('Verifier', () => {
           .spyOn(global.Date, 'now')
           .mockImplementationOnce(() => prevHeader.timestamp.getTime() + 1 * 1000)
 
-        const invalidHeader = new BlockHeader({
+        const invalidHeader = nodeTest.strategy.newBlockHeader({
           ...header,
           timestamp: new Date(prevHeader.timestamp.getTime() + 1 * 1000),
         })
@@ -895,15 +895,17 @@ describe('Verifier', () => {
       const newBlock = await useMinerBlockFixture(chain)
       await expect(chain).toAddBlock(newBlock)
 
-      const invalidNewBlock = Block.fromRaw({
-        header: {
-          ...newBlock.header,
-          noteCommitment: Buffer.alloc(newBlock.header.noteCommitment.length, 'NOOO'),
+      const invalidNewBlock = nodeTest.strategy.newBlock(
+        {
+          header: {
+            ...newBlock.header,
+            noteCommitment: Buffer.alloc(newBlock.header.noteCommitment.length, 'NOOO'),
+          },
+          transactions: newBlock.transactions,
         },
-        transactions: newBlock.transactions,
-      })
-      invalidNewBlock.header.noteSize = newBlock.header.noteSize
-      invalidNewBlock.header.work = newBlock.header.work
+        newBlock.header.noteSize,
+        newBlock.header.work,
+      )
 
       await expect(
         nodeTest.verifier.verifyConnectedBlock(invalidNewBlock),

diff --git a/ironfish/src/genesis/addGenesisTransaction.ts b/ironfish/src/genesis/addGenesisTransaction.ts
@@ -9,7 +9,7 @@ import {
 } from '@ironfish/rust-nodejs'
 import { Logger } from '../logger'
 import { FullNode } from '../node'
-import { Block, BlockHeader } from '../primitives'
+import { Block } from '../primitives'
 import { transactionCommitment } from '../primitives/blockheader'
 import { Transaction, TransactionVersion } from '../primitives/transaction'
 import { CurrencyUtils } from '../utils'
@@ -139,7 +139,7 @@ export async function addGenesisTransaction(
     graffiti: genesisBlock.header.graffiti,
   }
 
-  const newGenesisHeader = new BlockHeader(rawHeader, noteSize)
+  const newGenesisHeader = node.chain.strategy.newBlockHeader(rawHeader, noteSize)
 
   genesisBlock.header = newGenesisHeader
 

diff --git a/ironfish/src/genesis/genesis.test.slow.ts b/ironfish/src/genesis/genesis.test.slow.ts
@@ -121,7 +121,7 @@ describe('Create genesis block', () => {
 
     // Deserialize the block and add it to the new chain
     const result = IJSON.parse(jsonedBlock) as SerializedBlock
-    const deserializedBlock = BlockSerde.deserialize(result)
+    const deserializedBlock = BlockSerde.deserialize(result, nodeTest.strategy)
     const addedBlock = await newChain.addBlock(deserializedBlock)
     expect(addedBlock.isAdded).toBe(true)
 
@@ -274,7 +274,7 @@ describe('addGenesisTransaction', () => {
 
     // Deserialize the block and add it to the new chain
     const result = IJSON.parse(jsonedBlock) as SerializedBlock
-    const deserializedBlock = BlockSerde.deserialize(result)
+    const deserializedBlock = BlockSerde.deserialize(result, nodeTest.strategy)
     const addedBlock = await chain.addBlock(deserializedBlock)
     expect(addedBlock.isAdded).toBe(true)
 

diff --git a/ironfish/src/genesis/makeGenesisBlock.ts b/ironfish/src/genesis/makeGenesisBlock.ts
@@ -170,17 +170,18 @@ export async function makeGenesisBlock(
     GraffitiUtils.fromString('genesis'),
   )
 
-  const genesisBlock = Block.fromRaw({
-    header: {
-      ...block.header,
-      target: info.target,
-      timestamp: new Date(info.timestamp),
+  const genesisBlock = chain.strategy.newBlock(
+    {
+      header: {
+        ...block.header,
+        target: info.target,
+        timestamp: new Date(info.timestamp),
+      },
+      transactions: block.transactions,
     },
-    transactions: block.transactions,
-  })
-
-  genesisBlock.header.noteSize = block.header.noteSize
-  genesisBlock.header.work = block.header.work
+    block.header.noteSize,
+    block.header.work,
+  )
 
   logger.info('Block complete.')
   return { block: genesisBlock }

diff --git a/ironfish/src/mining/manager.test.slow.ts b/ironfish/src/mining/manager.test.slow.ts
@@ -4,7 +4,7 @@
 import { Assert } from '../assert'
 import { VerificationResultReason } from '../consensus'
 import { getBlockWithMinersFeeSize, getTransactionSize } from '../network/utils/serializers'
-import { Block, Target, Transaction } from '../primitives'
+import { Target, Transaction } from '../primitives'
 import { TransactionVersion } from '../primitives/transaction'
 import { BlockTemplateSerde, SerializedBlockTemplate } from '../serde'
 import {
@@ -626,7 +626,7 @@ describe('Mining manager', () => {
       // Create 2 blocks at the same sequence, one with higher difficulty
       const blockA1 = await useMinerBlockFixture(chain, undefined, account, wallet)
       const blockB1Temp = await useMinerBlockFixture(chain, undefined, account, wallet)
-      const blockB1 = Block.fromRaw({
+      const blockB1 = nodeTest.strategy.newBlock({
         header: {
           ...blockB1Temp.header,
           target: Target.fromDifficulty(blockA1.header.target.toDifficulty() + 1n),
@@ -641,8 +641,8 @@ describe('Mining manager', () => {
       await expect(chain).toAddBlock(blockB1)
 
       // Increase difficulty of submitted template so it
-      const blockA2Temp = BlockTemplateSerde.deserialize(templateA2)
-      const blockA2 = Block.fromRaw({
+      const blockA2Temp = BlockTemplateSerde.deserialize(templateA2, nodeTest.strategy)
+      const blockA2 = nodeTest.strategy.newBlock({
         header: {
           ...blockA2Temp.header,
           target: Target.fromDifficulty(blockA2Temp.header.target.toDifficulty() + 2n),
@@ -680,7 +680,7 @@ describe('Mining manager', () => {
         MINED_RESULT.SUCCESS,
       )
 
-      const submittedBlock = BlockTemplateSerde.deserialize(template)
+      const submittedBlock = BlockTemplateSerde.deserialize(template, nodeTest.strategy)
       const newBlock = onNewBlockSpy.mock.calls[0][0]
       expect(newBlock.header.hash).toEqual(submittedBlock.header.hash)
     })

diff --git a/ironfish/src/mining/manager.ts b/ironfish/src/mining/manager.ts
@@ -198,7 +198,7 @@ export class MiningManager {
       this.metrics.mining_newBlockTemplate.add(BenchUtils.end(connectedAt))
       this.streamBlockTemplate(currentBlock, template)
 
-      const block = BlockTemplateSerde.deserialize(template)
+      const block = BlockTemplateSerde.deserialize(template, this.chain.strategy)
       const verification = await this.chain.verifier.verifyBlock(block, {
         verifyTarget: false,
       })
@@ -366,7 +366,7 @@ export class MiningManager {
   }
 
   async submitBlockTemplate(blockTemplate: SerializedBlockTemplate): Promise<MINED_RESULT> {
-    const block = BlockTemplateSerde.deserialize(blockTemplate)
+    const block = BlockTemplateSerde.deserialize(blockTemplate, this.chain.strategy)
 
     const blockDisplay = `${block.header.hash.toString('hex')} (${block.header.sequence})`
     if (!block.header.previousBlockHash.equals(this.node.chain.head.hash)) {

diff --git a/ironfish/src/network/messages/getBlocks.test.ts b/ironfish/src/network/messages/getBlocks.test.ts
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-import { Block, BlockHeader, Target } from '../../primitives'
+import { Block, Target } from '../../primitives'
 import { transactionCommitment } from '../../primitives/blockheader'
 import {
   createNodeTest,
@@ -36,7 +36,7 @@ describe('GetBlocksResponse', () => {
     const message = new GetBlocksResponse(
       [
         new Block(
-          new BlockHeader({
+          nodeTest.strategy.newBlockHeader({
             sequence: 2,
             previousBlockHash: Buffer.alloc(32, 2),
             noteCommitment: Buffer.alloc(32, 4),
@@ -49,7 +49,7 @@ describe('GetBlocksResponse', () => {
           [transactionA, transactionB],
         ),
         new Block(
-          new BlockHeader({
+          nodeTest.strategy.newBlockHeader({
             sequence: 2,
             previousBlockHash: Buffer.alloc(32, 1),
             noteCommitment: Buffer.alloc(32, 5),