From 405720b218c74ec730541cdcb360db54deb75474 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 24 Apr 2015 17:45:51 +0200 Subject: xeth, core, cmd/utils: Transaction can not be over block gas limit Transactions will be invalidated when the tx.gas_limit > block.gas_limit --- cmd/utils/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b8f3982e2..a75663a4c 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) -- cgit v1.2.3 From ed036a2ce7d846297032a803fd7e82a3f84b239a Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 24 Apr 2015 23:57:05 +0200 Subject: cmd/geth: bump version number 0.9.12 --- cmd/geth/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index e399731e7..376e9bc5a 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") -- cgit v1.2.3