core.BlockHash

Author: rian

core/block.go

@@ -125,13 +125,8 @@ func VerifyBlockHash(b *Block, network *utils.Network) (*BlockCommitments, error
 // BlockHash assumes block.SequencerAddress is not nil as this is called with post v0.12.0
 // and by then issues with unverifiable block hash were resolved.
 // In future, this may no longer be required.
-func BlockHash(b *Block) (*felt.Felt, error) {
-	if b.SequencerAddress == nil {
-		return nil, errors.New("block.SequencerAddress is nil")
-	}
-
-	h, _, err := post07Hash(b, nil)
-	return h, err
+func BlockHash(b *Block, network *utils.Network) (*felt.Felt, *BlockCommitments, error) {
+	return blockHash(b, network, nil)
 }
 
 // blockHash computes the block hash, with option to override sequence address

core/block_test.go

@@ -253,7 +253,7 @@ func TestBlockHashP2P(t *testing.T) {
 
 		mainnetBlock1.SequencerAddress = nil
 
-		_, err = core.BlockHash(mainnetBlock1)
+		_, _, err = core.BlockHash(mainnetBlock1, &utils.Mainnet)
 		assert.EqualError(t, err, "block.SequencerAddress is nil")
 	})
 }

p2p/sync.go

@@ -343,7 +343,7 @@ func (s *syncService) adaptAndSanityCheckBlock(ctx context.Context, header *spec
 
 			coreBlock.Header = &coreHeader
 			coreBlock.EventsBloom = core.EventsBloom(coreBlock.Receipts)
-			h, err := core.BlockHash(coreBlock)
+			h, _, err := core.BlockHash(coreBlock, s.network)
 			if err != nil {
 				bodyCh <- blockBody{err: fmt.Errorf("block hash calculation error: %v", err)}
 				return