gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bloom, updated mining & block processing

Browse Source 
* Reverted back to process blocks in batches method
* Bloom generation and lookup fix
* Minor UI changed (mainly debug)
This commit is contained in:
obscuren
2014-11-10 01:17:31 +01:00
parent f538ea25e4
commit cbeebcd47d
14 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
chain/bloom9.go
View File

@ -21,18 +21,18 @@ func CreateBloom(block *Block) []byte {
func LogsBloom(logs state.Logs) *big.Int {
bin := new(big.Int)
for _, log := range logs {
data := [][]byte{crypto.Sha3(log.Address)}
data := [][]byte{log.Address}
for _, topic := range log.Topics {
data = append(data, topic)
}
if log.Data != nil {
data = append(data, log.Data)
for _, b := range data {
bin.Or(bin, ethutil.BigD(bloom9(crypto.Sha3(b)).Bytes()))
}
for _, b := range data {
bin.Or(bin, bloom9(b))
}
//if log.Data != nil {
// data = append(data, log.Data)
//}
}
return bin
@ -51,7 +51,7 @@ func bloom9(b []byte) *big.Int {
func BloomLookup(bin, topic []byte) bool {
bloom := ethutil.BigD(bin)
cmp := bloom9(topic)
cmp := bloom9(crypto.Sha3(topic))
return bloom.And(bloom, cmp).Cmp(cmp) == 0
}