diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-25 06:56:17 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-25 06:56:17 +0800 |
| commit | 8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4 (patch) | |
| tree | ff72b1935c12817594466adfa3334e9f23736924 /cmd | |
| parent | 7afbd0f20d39ed3957f696f49da8c159735e95d3 (diff) | |
| parent | ed036a2ce7d846297032a803fd7e82a3f84b239a (diff) | |
| download | go-tangerine-8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4.tar.gz go-tangerine-8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4.tar.zst go-tangerine-8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4.zip | |
Merge pull request #805 from obscuren/download_improvements
eth, eth/downloader: improve downloader and remove asynchronousness
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 2 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 5afdecfbf..c210431ba 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -47,7 +47,7 @@ import _ "net/http/pprof" const ( ClientIdentifier = "Geth" - Version = "0.9.11" + Version = "0.9.12" ) var app = utils.NewApp(Version, "the go-ethereum command line interface") diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index eb36d1b90..c013510d8 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -317,7 +317,7 @@ func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Dat eventMux := new(event.TypeMux) chainManager := core.NewChainManager(blockDb, stateDb, eventMux) pow := ethash.New(chainManager) - txPool := core.NewTxPool(eventMux, chainManager.State) + txPool := core.NewTxPool(eventMux, chainManager.State, chainManager.GasLimit) blockProcessor := core.NewBlockProcessor(stateDb, extraDb, pow, txPool, chainManager, eventMux) chainManager.SetProcessor(blockProcessor) |