diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-15 21:24:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 21:24:16 +0800 |
| commit | 1a652afe162ee98eba6b5ff788e322af3e7c6825 (patch) | |
| tree | ef73cee5f83153b08bac232903aa5020dd923327 | |
| parent | b7caa1751c83db797f648659bcf1cdb3c6be940a (diff) | |
| parent | 86bc7795a3dfa4032a492f3e4150c7d1506e5b2d (diff) | |
| download | go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.tar go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.tar.gz go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.tar.bz2 go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.tar.lz go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.tar.xz go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.tar.zst go-tangerine-1a652afe162ee98eba6b5ff788e322af3e7c6825.zip | |
Merge pull request #2724 from pirapira/fix_reset_fees
vm: Replace some SstoreClearGas with SstoreResetGas
| -rw-r--r-- | core/vm/jit.go | 2 | ||||
| -rw-r--r-- | core/vm/vm.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/vm/jit.go b/core/vm/jit.go index f56d7c1af..e2374df42 100644 --- a/core/vm/jit.go +++ b/core/vm/jit.go @@ -421,7 +421,7 @@ func jitCalculateGasAndSize(env Environment, contract *Contract, instr instructi g = params.SstoreClearGas } else { - g = params.SstoreClearGas + g = params.SstoreResetGas } gas.Set(g) case SUICIDE: diff --git a/core/vm/vm.go b/core/vm/vm.go index 0f93715d6..52e782b23 100644 --- a/core/vm/vm.go +++ b/core/vm/vm.go @@ -306,7 +306,7 @@ func calculateGasAndSize(env Environment, contract *Contract, caller ContractRef g = params.SstoreClearGas } else { // non 0 => non 0 (or 0 => 0) - g = params.SstoreClearGas + g = params.SstoreResetGas } gas.Set(g) case SUICIDE: |