aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-24 23:45:51 +0800
committerobscuren <geffobscura@gmail.com>2015-04-24 23:48:13 +0800
commit405720b218c74ec730541cdcb360db54deb75474 (patch)
treeb403e8c1e35884aac71bd51cff8489e4305adba8 /cmd
parent3bb6da9bd3111c8083cdefde1aa93a7ac55d19d2 (diff)
downloadgo-tangerine-405720b218c74ec730541cdcb360db54deb75474.tar.gz
go-tangerine-405720b218c74ec730541cdcb360db54deb75474.tar.zst
go-tangerine-405720b218c74ec730541cdcb360db54deb75474.zip
xeth, core, cmd/utils: Transaction can not be over block gas limit
Transactions will be invalidated when the tx.gas_limit > block.gas_limit
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go2
1 files changed, 1 insertions, 1 deletions
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)
8a0675ea0'>Now replacing all occurences during the customization ofznerd2002-03-291-19/+19 * Improved startup script. It now creates the PID file and fixesznerd2002-03-292-1/+14 * First checking if WITH_JIKES is actually defined beforeznerd2002-03-281-2/+2 * Synced control program and man page. Bumped PORTREVISION to 11.znerd2002-03-283-28/+33 * Using a C program instead of a shell script for controllingznerd2002-03-284-185/+375 * Now uses USE_JAVA.znerd2002-03-281-12/+2 * o Fixed potential security problem, by leavingznerd2002-03-132-62/+74 * Fixed the description for the /var/run/orion.pid file.znerd2002-03-131-3/+3 * Using ECHO_CMD instead of ECHO.znerd2002-03-121-17/+17 * Changed to reflect the current version of the installedznerd2002-03-121-15/+15 * Improvements:znerd2002-03-081-45/+58 * Added in order to be able to automatically enableznerd2002-03-081-0/+37 * Not deleting the PID file but emptying it. Reasoning behindznerd2002-03-084-27/+62 * Changes:znerd2002-03-054-150/+200 * Improved pkg-deinstall. It now displays a warning messageznerd2002-03-052-7/+33 * Changes:znerd2002-03-053-21/+56 * Fixed bug that caused install target to fail. Bumped PORTREVISION.znerd2002-03-051-2/+2 * Now allows for setting the port the RMI server will listen to.znerd2002-03-051-5/+13 * Added a download location.znerd2002-02-281-0/+1 * Upgraded the application to 1.5.2znerd2002-02-073-8/+10 * A lot of small changes. It's now possible to change the Java port using the J...znerd2002-02-044-124/+146 * Made the JDK both a RUN_DEPENDS *and* a BUILD_DEPENDS now.znerd2001-11-211-0/+1 * Updated my mail address from ernst@jollem.com to znerd@FreeBSD.org. Made theznerd2001-11-211-8/+6 * Improve download locations.sobomax2001-10-191-3/+4 * Improve the port (see ports/31001 for detailed list of changes).sobomax2001-10-093-10/+84 * Update to show the move from java to wwwjeh2001-06-271-1/+1 * Improves the Orion port. Now honours NOPORTDOCS too.jeh2001-06-272-398/+401 * Several fixes and improvements:sobomax2001-06-125-17/+131 * Java now lives in ${LOCALBASE}/linux-jdk1.3.1, not in linux-jdk1.3.0.sobomax2001-06-051-1/+1 * Update that introduces extra flexibility for the installation processsobomax2001-05-294-431/+471 * Put a copy of distfile to MASTER_SITE_LOCAL in order to minimise load onsobomax2001-05-271-0/+2 * From the PR:alex2001-05-223-12/+48 * Remove bogus comments from the end of file.sobomax2001-05-191-19/+0 * * Portrevision from 1 to 2 (version is still 1.4.5)sobomax2001-05-174-25/+65 * Added port version in post-install output messagealex2001-05-093-396/+421 * Update to version 1.4.5.steve2001-02-263-200/+206