diff options
| -rw-r--r-- | block_pool.go | 5 | ||||
| -rw-r--r-- | chain/block.go | 2 | ||||
| -rw-r--r-- | chain/block_manager.go | 20 | ||||
| -rw-r--r-- | chain/bloom9.go | 8 | ||||
| -rw-r--r-- | chain/receipt.go | 6 |
5 files changed, 20 insertions, 21 deletions
diff --git a/block_pool.go b/block_pool.go index a1c3fc096..090871fd3 100644 --- a/block_pool.go +++ b/block_pool.go @@ -323,7 +323,10 @@ out: self.Reset() - poollogger.Debugf("Punishing peer for supplying bad chain (%v)\n", self.peer.conn.RemoteAddr()) + if self.peer != nil && self.peer.conn != nil { + poollogger.Debugf("Punishing peer for supplying bad chain (%v)\n", self.peer.conn.RemoteAddr()) + } + // This peer gave us bad hashes and made us fetch a bad chain, therefor he shall be punished. self.eth.BlacklistPeer(self.peer) self.peer.StopWithReason(DiscBadPeer) diff --git a/chain/block.go b/chain/block.go index 23a7c63a2..a4ab560dc 100644 --- a/chain/block.go +++ b/chain/block.go @@ -238,7 +238,7 @@ func (block *Block) SetUncles(uncles []*Block) { func (self *Block) SetReceipts(receipts Receipts) { self.receipts = receipts self.ReceiptSha = DeriveSha(receipts) - self.LogsBloom = CreateBloom(self) + self.LogsBloom = CreateBloom(receipts) } func (self *Block) SetTransactions(txs Transactions) { diff --git a/chain/block_manager.go b/chain/block_manager.go index d39f188d4..efe9e0862 100644 --- a/chain/block_manager.go +++ b/chain/block_manager.go @@ -159,8 +159,8 @@ done: txGas.Sub(txGas, st.gas) cumulative := new(big.Int).Set(totalUsedGas.Add(totalUsedGas, txGas)) - bloom := ethutil.LeftPadBytes(LogsBloom(state.Logs()).Bytes(), 64) - receipt := &Receipt{ethutil.CopyBytes(state.Root()), cumulative, bloom, state.Logs()} + receipt := &Receipt{ethutil.CopyBytes(state.Root()), cumulative, nil /*bloom*/, state.Logs()} + receipt.Bloom = CreateBloom(Receipts{receipt}) // Notify all subscribers go self.eth.EventMux().Post(TxPostEvent{tx}) @@ -217,38 +217,38 @@ func (sm *BlockManager) ProcessWithParent(block, parent *Block) (td *big.Int, me txSha := DeriveSha(block.transactions) if bytes.Compare(txSha, block.TxSha) != 0 { - err = fmt.Errorf("Error validating transaction root. Received %x, got %x", block.TxSha, txSha) + err = fmt.Errorf("validating transaction root. received=%x got=%x", block.TxSha, txSha) return } receiptSha := DeriveSha(receipts) if bytes.Compare(receiptSha, block.ReceiptSha) != 0 { - err = fmt.Errorf("Error validating receipt root. Received %x, got %x", block.ReceiptSha, receiptSha) + err = fmt.Errorf("validating receipt root. received=%x got=%x", block.ReceiptSha, receiptSha) return } // Block validation if err = sm.ValidateBlock(block, parent); err != nil { - statelogger.Errorln("Error validating block:", err) + statelogger.Errorln("validating block:", err) return } if err = sm.AccumelateRewards(state, block, parent); err != nil { - statelogger.Errorln("Error accumulating reward", err) + statelogger.Errorln("accumulating reward", err) return } - block.receipts = receipts - rbloom := CreateBloom(block) + block.receipts = receipts // although this isn't necessary it be in the future + rbloom := CreateBloom(receipts) if bytes.Compare(rbloom, block.LogsBloom) != 0 { - err = fmt.Errorf("unable to replicate block's bloom: %x", rbloom) + err = fmt.Errorf("unable to replicate block's bloom=%x", rbloom) return } state.Update() if !block.State().Cmp(state) { - err = fmt.Errorf("Invalid merkle root.\nrec: %x\nis: %x", block.State().Root(), state.Root()) + err = fmt.Errorf("invalid merkle root. received=%x got=%x", block.Root(), state.Root()) return } diff --git a/chain/bloom9.go b/chain/bloom9.go index bf270127e..c610bd101 100644 --- a/chain/bloom9.go +++ b/chain/bloom9.go @@ -8,16 +8,16 @@ import ( "github.com/ethereum/go-ethereum/state" ) -func CreateBloom(block *Block) []byte { +func CreateBloom(receipts Receipts) []byte { bin := new(big.Int) - for _, receipt := range block.Receipts() { - bin.Or(bin, LogsBloom(receipt.logs)) + for _, receipt := range receipts { + bin.Or(bin, logsBloom(receipt.logs)) } return ethutil.LeftPadBytes(bin.Bytes(), 64) } -func LogsBloom(logs state.Logs) *big.Int { +func logsBloom(logs state.Logs) *big.Int { bin := new(big.Int) for _, log := range logs { data := [][]byte{log.Address} diff --git a/chain/receipt.go b/chain/receipt.go index c2e6f53a5..fa53f1cdb 100644 --- a/chain/receipt.go +++ b/chain/receipt.go @@ -51,11 +51,7 @@ func (self *Receipt) Cmp(other *Receipt) bool { } func (self *Receipt) String() string { - return fmt.Sprintf(`Receipt: %x -cumulative gas: %v -bloom: %x -logs: %v -rlp: %x`, self.PostState, self.CumulativeGasUsed, self.Bloom, self.logs, self.RlpEncode()) + return fmt.Sprintf("receipt{med=%x cgas=%v bloom=%x logs=%v}", self.PostState, self.CumulativeGasUsed, self.Bloom, self.logs) } type Receipts []*Receipt |