Move bloom optimization to only RPC return

Author: Djadih

core/headerchain.go

@@ -266,10 +266,6 @@ func (hc *HeaderChain) GetBloom(hash common.Hash) (*types.Bloom, error) {
 		return nil, ErrBloomNotFound
 	}
 
-	if bloom.CheckAllZeros() {
-		return nil, nil
-	}
-	
 	return &bloom, nil
 }
 

internal/quaiapi/api.go

@@ -1301,10 +1301,15 @@ func (s *PublicBlockChainAPI) GetTransactionReceipt(ctx context.Context, hash co
 		"cumulativeGasUsed": hexutil.Uint64(receipt.CumulativeGasUsed),
 		"contractAddress":   nil,
 		"logs":              receipt.Logs,
-		"logsBloom":         receipt.Bloom.ToLegacyBloom(),
 		"type":              hexutil.Uint(tx.Type()),
 	}
 
+	if receipt.Bloom.CheckAllZeros() {
+		fields["logsBloom"] = nil
+	} else {
+		fields["logsBloom"] = receipt.Bloom.ToLegacyBloom()
+	}
+
 	if tx.Type() == types.QuaiTxType {
 		if to := tx.To(); to != nil {
 			fields["to"] = to.Hex()

internal/quaiapi/quai_api.go

@@ -1457,10 +1457,15 @@ func (s *PublicBlockChainQuaiAPI) GetTransactionReceipt(ctx context.Context, has
 		"cumulativeGasUsed": hexutil.Uint64(receipt.CumulativeGasUsed),
 		"contractAddress":   nil,
 		"logs":              receipt.Logs,
-		"logsBloom":         receipt.Bloom,
 		"type":              hexutil.Uint(tx.Type()),
 	}
 
+	if receipt.Bloom.CheckAllZeros() {
+		fields["logsBloom"] = nil
+	} else {
+		fields["logsBloom"] = receipt.Bloom
+	}
+
 	if tx.Type() == types.QuaiTxType {
 		if to := tx.To(); to != nil {
 			fields["to"] = to.Hex()