Merge pull request #20075 from holiman/evm_defaults

karalabe · web-flow · commit 8bd64f4a1c26 · 2019-09-16T13:34:52.000+03:00
cmd/evm: make evm default to all ethash protocol changes
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
@@ -198,6 +198,8 @@ func runCmd(ctx *cli.Context) error {
 
 	if chainConfig != nil {
 		runtimeConfig.ChainConfig = chainConfig
+	} else {
+		runtimeConfig.ChainConfig = params.AllEthashProtocolChanges
 	}
 	tstart := time.Now()
 	var leftOverGas uint64

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,8 @@ func runCmd(ctx *cli.Context) error {`
`198`	`198`
`199`	`199`	`if chainConfig != nil {`
`200`	`200`	`runtimeConfig.ChainConfig = chainConfig`
	`201`	`+ } else {`
	`202`	`+ runtimeConfig.ChainConfig = params.AllEthashProtocolChanges`
`201`	`203`	`}`
`202`	`204`	`tstart := time.Now()`
`203`	`205`	`var leftOverGas uint64`