Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tangerine whistle bugs #312

Merged
merged 4 commits into from
Apr 15, 2019
Merged

Fix tangerine whistle bugs #312

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34fd831
fix block 2283416 problem
jangko Apr 10, 2019
69c1d9e
fix block 2.463.413 problem
jangko Apr 15, 2019
ea7d944
update test log, GST +3
jangko Apr 15, 2019
c852199
add test data
jangko Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
fix block 2.463.413 problem
  • Loading branch information
@jangko
jangko committed Apr 15, 2019
commit 69c1d9e357414f98c303ad673c3b6b5edab2b8c8
22 changes: 11 additions & 11 deletions nimbus/vm/interpreter/gas_costs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import
math, eth/common/eth_types,
./utils/[macros_gen_opcodes, utils_numeric],
./opcode_values, ./vm_forks
./opcode_values, ./vm_forks, ../../errors

# Gas Fee Schedule
# Yellow Paper Appendix G - https://ethereum.github.io/yellowpaper/paper.pdf
Expand Down Expand Up @@ -67,7 +67,7 @@ type
of Call, CallCode, DelegateCall, StaticCall:
c_isNewAccount*: bool
c_gasBalance*: GasInt
c_contractGas*: Gasint
c_contractGas*: Uint256
c_currentMemSize*: Natural
c_memOffset*: Natural
c_memLength*: Natural
Expand Down Expand Up @@ -325,16 +325,16 @@ template gasCosts(fork: Fork, prefix, ResultGasCostsName: untyped) =
# Cgascap
when fork >= FkTangerine:
# https://github.com/ethereum/EIPs/blob/master/EIPS/eip-150.md
result.gasRefund =
if gasParams.c_gasBalance >= result.gasCost:
min(
`prefix all_but_one_64th`(gasParams.c_gasBalance - result.gasCost),
gasParams.c_contractGas
)
else:
gasParams.c_contractGas
let gas = `prefix all_but_one_64th`(gasParams.c_gasBalance - result.gasCost)
if gasParams.c_contractGas > high(GasInt).u256 or
gas < gasParams.c_contractGas.truncate(GasInt):
result.gasRefund = gas
else:
result.gasRefund = gasParams.c_contractGas.truncate(GasInt)
else:
result.gasRefund += gasParams.c_contractGas
if gasParams.c_contractGas > high(GasInt).u256:
raise newException(TypeError, "GasInt Overflow (" & $gasParams.kind & ") " & $gasParams.c_contractGas)
result.gasRefund = gasParams.c_contractGas.truncate(GasInt)

result.gasCost += result.gasRefund

Expand Down
5 changes: 1 addition & 4 deletions nimbus/vm/interpreter/opcodes_impl.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,15 +710,12 @@ template genCall(callName: untyped, opCode: Op): untyped =
else:
(memOutPos, memOutLen)

if gas > high(GasInt).u256:
raise newException(TypeError, "GasInt Overflow (" & callNameStr & ")")

let (childGasFee, childGasLimit) = computation.gasCosts[opCode].c_handler(
value,
GasParams(kind: opCode,
c_isNewAccount: isNewAccount,
c_gasBalance: computation.gasMeter.gasRemaining,
c_contractGas: gas.truncate(GasInt),
c_contractGas: gas,
c_currentMemSize: computation.memory.len,
c_memOffset: memOffset,
c_memLength: memLength
Expand Down