aboutsummaryrefslogtreecommitdiffstats
path: root/chain/bloom9.go
diff options
context:
space:
mode:
Diffstat (limited to 'chain/bloom9.go')
-rw-r--r--chain/bloom9.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/chain/bloom9.go b/chain/bloom9.go
index ced31cc30..2bbc9409d 100644
--- a/chain/bloom9.go
+++ b/chain/bloom9.go
@@ -3,24 +3,25 @@ package chain
import (
"math/big"
+ "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
)
func CreateBloom(block *Block) []byte {
bin := new(big.Int)
- bin.Or(bin, bloom9(block.Coinbase))
+ bin.Or(bin, bloom9(crypto.Sha3(block.Coinbase)))
for _, receipt := range block.Receipts() {
bin.Or(bin, LogsBloom(receipt.logs))
}
- return bin.Bytes()
+ return ethutil.LeftPadBytes(bin.Bytes(), 64)
}
func LogsBloom(logs state.Logs) *big.Int {
bin := new(big.Int)
for _, log := range logs {
- data := [][]byte{log.Address}
+ data := [][]byte{crypto.Sha3(log.Address)}
for _, topic := range log.Topics {
data = append(data, topic)
}
@@ -41,7 +42,8 @@ func bloom9(b []byte) *big.Int {
r := new(big.Int)
for _, i := range []int{0, 2, 4} {
t := big.NewInt(1)
- r.Or(r, t.Lsh(t, uint(b[i+1])+256*(uint(b[i])&1)))
+ b := uint(b[i+1]) + 256*(uint(b[i])&1)
+ r.Or(r, t.Lsh(t, b))
}
return r