diff options
| author | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-04-02 11:17:15 +0800 |
|---|---|---|
| committer | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-04-02 12:22:32 +0800 |
| commit | c26c8d3a44cdd45994b6d99777d620565bab8f9c (patch) | |
| tree | 6ab5a74981e9fb9f869f1ef884a375163b898113 /core/execution.go | |
| parent | 516ec28544e0f9c76e18d82742d3ae58cfb59cc1 (diff) | |
| download | go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.tar go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.tar.gz go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.tar.bz2 go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.tar.lz go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.tar.xz go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.tar.zst go-tangerine-c26c8d3a44cdd45994b6d99777d620565bab8f9c.zip | |
Read most protocol params from common/params.json
* Add params package with exported variables generated from
github.com/ethereum/common/blob/master/params.json
* Use params package variables in applicable places
* Add check for minimum gas limit in validation of block's gas limit
* Remove common/params.json from go-ethereum to avoid
outdated version of it
Diffstat (limited to 'core/execution.go')
| -rw-r--r-- | core/execution.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/execution.go b/core/execution.go index 93fb03ecc..8134471d1 100644 --- a/core/execution.go +++ b/core/execution.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/params" ) type Execution struct { @@ -43,7 +44,7 @@ func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm. env := self.env evm := self.evm - if env.Depth() == vm.MaxCallDepth { + if env.Depth() > int(params.CallCreateDepth.Int64()) { caller.ReturnGas(self.Gas, self.price) return nil, vm.DepthError{} |