diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 17:17:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 17:17:18 +0800 |
| commit | fd4e161497156a5d12fd8712f41574bc7fb20404 (patch) | |
| tree | 56ce21d1aaf6df3908335601a687f0f3ac4a50be /core/execution.go | |
| parent | e0493457d5a9d280554990b5a29c4fcad69e7d0b (diff) | |
| parent | 6362a9d6102b26e926b3e73563267fc75cb30f9c (diff) | |
| download | dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.tar dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.gz dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.bz2 dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.lz dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.xz dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.zst dexon-fd4e161497156a5d12fd8712f41574bc7fb20404.zip | |
Merge pull request #2752 from karalabe/revert-soft-fork
Revert faulty DAO soft-fork
Diffstat (limited to 'core/execution.go')
| -rw-r--r-- | core/execution.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/core/execution.go b/core/execution.go index d2008bc3e..82143443c 100644 --- a/core/execution.go +++ b/core/execution.go @@ -84,10 +84,7 @@ func exec(env vm.Environment, caller vm.ContractRef, address, codeAddr *common.A address = &addr createAccount = true } - // Mark all contracts doing outbound value transfers to allow DAO filtering. - if value.Cmp(common.Big0) > 0 { - env.MarkCodeHash(env.Db().GetCodeHash(caller.Address())) - } + snapshotPreTransfer := env.MakeSnapshot() var ( from = env.Db().GetAccount(caller.Address()) @@ -146,10 +143,7 @@ func execDelegateCall(env vm.Environment, caller vm.ContractRef, originAddr, toA caller.ReturnGas(gas, gasPrice) return nil, common.Address{}, vm.DepthError } - // Mark all contracts doing outbound value transfers to allow DAO filtering. - if value.Cmp(common.Big0) > 0 { - env.MarkCodeHash(env.Db().GetCodeHash(caller.Address())) - } + snapshot := env.MakeSnapshot() var to vm.Account |