simulators/ethereum/engine: Fix wrong TD calculation (#629)

asdacap · fjl · web-flow · commit 7c6914c46fdd · 2022-08-08T09:08:42.000-05:00
* Fix wrong TD calculated

* Update helper.go

Co-authored-by: Felix Lange &lt;fjl@twurst.com&gt;
diff --git a/simulators/ethereum/engine/helper/helper.go b/simulators/ethereum/engine/helper/helper.go
@@ -190,10 +190,10 @@ func LoadGenesisBlock(path string) *types.Block {
 func CalculateTotalDifficulty(genesis core.Genesis, chain types.Blocks, lastBlock uint64) *big.Int {
 	result := new(big.Int).Set(genesis.Difficulty)
 	for _, b := range chain {
+		result.Add(result, b.Difficulty())
 		if lastBlock != 0 && lastBlock == b.NumberU64() {
 			break
 		}
-		result.Add(result, b.Difficulty())
 	}
 	return result
 }

Original file line number	Diff line number	Diff line change
`@@ -190,10 +190,10 @@ func LoadGenesisBlock(path string) *types.Block {`
`190`	`190`	`func CalculateTotalDifficulty(genesis core.Genesis, chain types.Blocks, lastBlock uint64) *big.Int {`
`191`	`191`	`result := new(big.Int).Set(genesis.Difficulty)`
`192`	`192`	`for _, b := range chain {`
	`193`	`+ result.Add(result, b.Difficulty())`
`193`	`194`	`if lastBlock != 0 && lastBlock == b.NumberU64() {`
`194`	`195`	`break`
`195`	`196`	`}`
`196`		`- result.Add(result, b.Difficulty())`
`197`	`197`	`}`
`198`	`198`	`return result`
`199`	`199`	`}`