Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Enable no empty blocks #350

Merged
merged 3 commits into from
Nov 24, 2017
Merged

Enable no empty blocks #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
075639e
using TxHash for appHash
kesar Nov 21, 2017
a5f9c2e
using TxHash instead of BlockHash for appHash
kesar Nov 21, 2017
6eb2986
Merge branch 'develop' into fix_empty_blocks
kesar Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (app *EthermintApplication) Info() abciTypes.ResponseInfo {
blockchain := app.backend.Ethereum().BlockChain()
currentBlock := blockchain.CurrentBlock()
height := currentBlock.Number()
hash := currentBlock.Hash()
hash := currentBlock.TxHash()

app.logger.Debug("Info", "height", height) // nolint: errcheck

Expand Down
2 changes: 1 addition & 1 deletion ethereum/pending.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func (w *work) commit(blockchain *core.BlockChain, db ethdb.Database) (common.Ha

// create block object and compute final commit hash (hash of the ethereum block)
block := ethTypes.NewBlock(w.header, w.transactions, nil, w.receipts)
blockHash := block.Hash()
blockHash := block.TxHash()

// save the block to disk
// log.Info("Committing block", "stateHash", hashArray, "blockHash", blockHash)
Expand Down