diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-02 19:39:46 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-02 19:39:46 +0800 |
| commit | 118ad22ee59658ec8ff476999e48d9bffb0c7db6 (patch) | |
| tree | b60422477450918993bdce27f22cd45d81952bd8 /core/execution.go | |
| parent | 81de8ed0912f767b2e3104aaad5c7f31920aaf2a (diff) | |
| parent | 79828531b1e6a1d5073f45e0e672c54a019de7c0 (diff) | |
| download | go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.gz go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.bz2 go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.lz go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.xz go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.zst go-tangerine-118ad22ee59658ec8ff476999e48d9bffb0c7db6.zip | |
Merge branch 'develop' into rpcfabian
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{} |