status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-03 15:55:47 +00:00
Code Issues Projects Releases Wiki Activity

fixes modexp gasFee bug

Browse Source
This commit is contained in:
andri lim 2020-02-11 09:28:34 +07:00 committed by zah
parent 71129cc2ab
commit 15c9fa54ec
5 changed files with 108 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralStateTests.md
View File

@ -823,7 +823,7 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
```diff
+ identity_to_bigger.json OK
+ identity_to_smaller.json OK
modexp.json Skip
+ modexp.json OK
+ modexp_0_0_0_1000000.json OK
+ modexp_0_0_0_155000.json OK
+ modexp_0_1_0_1000000.json OK
@ -918,7 +918,7 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
+ modexp_9_3711_37111_25000.json OK
+ sec80.json OK
```
OK: 95/96 Fail: 0/96 Skip: 1/96
OK: 96/96 Fail: 0/96 Skip: 0/96
## stPreCompiledContracts2
```diff
+ CALLCODEEcrecover0.json OK
@ -2645,4 +2645,4 @@ OK: 133/133 Fail: 0/133 Skip: 0/133
OK: 130/130 Fail: 0/130 Skip: 0/130
---TOTAL---
OK: 2344/2447 Fail: 0/2447 Skip: 103/2447
OK: 2345/2447 Fail: 0/2447 Skip: 102/2447

6
newBlockChainTests.md
View File

@ -1228,7 +1228,7 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
```diff
+ identity_to_bigger.json OK
+ identity_to_smaller.json OK
modexp.json Skip
+ modexp.json OK
+ modexp_0_0_0_1000000.json OK
+ modexp_0_0_0_155000.json OK
+ modexp_0_1_0_1000000.json OK
@ -1323,7 +1323,7 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
+ modexp_9_3711_37111_25000.json OK
+ sec80.json OK
```
OK: 95/96 Fail: 0/96 Skip: 1/96
OK: 96/96 Fail: 0/96 Skip: 0/96
## stPreCompiledContracts2
```diff
+ CALLBlake2f.json OK
@ -3028,4 +3028,4 @@ OK: 133/133 Fail: 0/133 Skip: 0/133
OK: 130/130 Fail: 0/130 Skip: 0/130
---TOTAL---
OK: 2621/2730 Fail: 0/2730 Skip: 109/2730
OK: 2622/2730 Fail: 0/2730 Skip: 108/2730

6
newGeneralStateTests.md
View File

@ -825,7 +825,7 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
```diff
+ identity_to_bigger.json OK
+ identity_to_smaller.json OK
modexp.json Skip
+ modexp.json OK
+ modexp_0_0_0_1000000.json OK
+ modexp_0_0_0_155000.json OK
+ modexp_0_1_0_1000000.json OK
@ -920,7 +920,7 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
+ modexp_9_3711_37111_25000.json OK
+ sec80.json OK
```
OK: 95/96 Fail: 0/96 Skip: 1/96
OK: 96/96 Fail: 0/96 Skip: 0/96
## stPreCompiledContracts2
```diff
+ CALLBlake2f.json OK
@ -2625,4 +2625,4 @@ OK: 133/133 Fail: 0/133 Skip: 0/133
OK: 130/130 Fail: 0/130 Skip: 0/130
---TOTAL---
OK: 2304/2411 Fail: 0/2411 Skip: 107/2411
OK: 2305/2411 Fail: 0/2411 Skip: 106/2411

173
nimbus/vm/precompiles.nim
View File

@ -135,105 +135,122 @@ proc identity*(computation: Computation) =
computation.output = computation.msg.data
trace "Identity precompile", output = computation.output.toHex
proc modExpInternal(computation: Computation, base_len, exp_len, mod_len: int, T: type StUint) =
template rawMsg: untyped {.dirty.} =
proc modExpInternal(computation: Computation, baseLen, expLen, modLen: int, T: type StUint) =
template data: untyped {.dirty.} =
computation.msg.data
block: # Gas cost
func gasModExp_f(x: Natural): int =
## Estimates the difficulty of Karatsuba multiplication
# x: maximum length in bytes between modulo and base
# TODO: Deal with negative max_len
result = case x
of 0 .. 64: x * x
of 65 .. 1024: x * x div 4 + 96 * x - 3072
else: x * x div 16 + 480 * x - 199680
let
base = data.rangeToPadded[:T](96, 95 + baseLen, baseLen)
exp = data.rangeToPadded[:T](96 + baseLen, 95 + baseLen + expLen, expLen)
modulo = data.rangeToPadded[:T](96 + baseLen + expLen, 95 + baseLen + expLen + modLen, modLen)
let adj_exp_len = block:
# TODO deal with negative length
let first32 = rawMsg.rangeToPadded2[:Uint256](96 + base_len, 95 + base_len + exp_len, min(exp_len, 32))
if exp_len <= 32:
if first32.isZero(): 0
else: log2(first32) # highest-bit in exponent
else:
# TODO: `modexpRandomInput.json` require Uint256 arithmetic for this code below
if not first32.isZero:
8 * (exp_len - 32) + first32.log2
else:
8 * (exp_len - 32)
# TODO: specs mentions that we should return in "M" format
# i.e. if Base and exp are uint512 and Modulo an uint256
# we should return a 256-bit big-endian byte array
let gasFee = block:
(
max(mod_len, base_len).gasModExp_f *
max(adj_exp_len, 1)
) div GasQuadDivisor
computation.gasMeter.consumeGas(gasFee, reason="ModExp Precompile")
block: # Processing
let
base = rawMsg.rangeToPadded[:T](96, 95 + base_len, base_len)
exp = rawMsg.rangeToPadded[:T](96 + base_len, 95 + base_len + exp_len, exp_len)
modulo = rawMsg.rangeToPadded[:T](96 + base_len + exp_len, 95 + base_len + exp_len + mod_len, mod_len)
# TODO: specs mentions that we should return in "M" format
# i.e. if Base and exp are uint512 and Modulo an uint256
# we should return a 256-bit big-endian byte array
# Force static evaluation
func zero(): array[T.bits div 8, byte] {.compileTime.} = discard
func one(): array[T.bits div 8, byte] {.compileTime.} =
when cpuEndian == bigEndian:
result[0] = 1
else:
result[^1] = 1
# Start with EVM special cases
let output = if modulo <= 1:
# If m == 0: EVM returns 0.
# If m == 1: we can shortcut that to 0 as well
zero()
elif exp.isZero():
# If 0^0: EVM returns 1
# For all x != 0, x^0 == 1 as well
one()
else:
powmod(base, exp, modulo).toByteArrayBE
# maximum output len is the same as mod_len
# if it less than mod_len, it will be zero padded at left
if output.len >= mod_len:
computation.output = @(output[^mod_len..^1])
# Force static evaluation
func zero(): array[T.bits div 8, byte] {.compileTime.} = discard
func one(): array[T.bits div 8, byte] {.compileTime.} =
when cpuEndian == bigEndian:
result[0] = 1
else:
computation.output = newSeq[byte](mod_len)
computation.output[^output.len..^1] = output[0..^1]
result[^1] = 1
# Start with EVM special cases
let output = if modulo <= 1:
# If m == 0: EVM returns 0.
# If m == 1: we can shortcut that to 0 as well
zero()
elif exp.isZero():
# If 0^0: EVM returns 1
# For all x != 0, x^0 == 1 as well
one()
else:
powmod(base, exp, modulo).toByteArrayBE
# maximum output len is the same as modLen
# if it less than modLen, it will be zero padded at left
if output.len >= modLen:
computation.output = @(output[^modLen..^1])
else:
computation.output = newSeq[byte](modLen)
computation.output[^output.len..^1] = output[0..^1]
proc modExpFee(c: Computation, baseLen, expLen, modLen: Uint256): GasInt =
template data: untyped {.dirty.} =
c.msg.data
func gasModExp(x: Uint256): Uint256 =
## Estimates the difficulty of Karatsuba multiplication
if x <= 64.u256: x * x
elif x <= 1024.u256: x * x div 4.u256 + 96.u256 * x - 3072.u256
else: x * x div 16.u256 + 480.u256 * x - 199680.u256
let adjExpLen = block:
let
baseL = baseLen.safeInt
expL = expLen.safeInt
first32 = if baseL.uint64 + expL.uint64 < high(int32).uint64 and baseL < data.len:
data.rangeToPadded2[:Uint256](96 + baseL, 95 + baseL + expL, min(expL, 32))
else:
0.u256
if expLen <= 32:
if first32.isZero(): 0.u256
else: first32.log2.u256 # highest-bit in exponent
else:
if not first32.isZero:
8.u256 * (expLen - 32.u256) + first32.log2.u256
else:
8.u256 * (expLen - 32.u256)
let gasFee = (
max(modLen, baseLen).gasModExp *
max(adjExpLen, 1.u256)
) div GasQuadDivisor
if gasFee > high(GasInt).u256:
raise newException(OutOfGas, "modExp gas overflow")
result = gasFee.truncate(GasInt)
proc modExp*(computation: Computation) =
## Modular exponentiation precompiled contract
## Yellow Paper Appendix E
## EIP-198 - https://github.com/ethereum/EIPs/blob/master/EIPS/eip-198.md
# Parsing the data
template rawMsg: untyped {.dirty.} =
template data: untyped {.dirty.} =
computation.msg.data
let # lengths Base, Exponent, Modulus
base_len = rawMsg.rangeToPadded[:Uint256](0, 31).safeInt
exp_len = rawMsg.rangeToPadded[:Uint256](32, 63).safeInt
mod_len = rawMsg.rangeToPadded[:Uint256](64, 95).safeInt
baseL = data.rangeToPadded[:Uint256](0, 31)
expL = data.rangeToPadded[:Uint256](32, 63)
modL = data.rangeToPadded[:Uint256](64, 95)
baseLen = baseL.safeInt
expLen = expL.safeInt
modLen = modL.safeInt
let maxBytes = max(base_len, max(exp_len, mod_len))
let gasFee = modExpFee(computation, baseL, expL, modL)
computation.gasMeter.consumeGas(gasFee, reason="ModExp Precompile")
if baseLen == 0 and modLen == 0:
# This is a special case where expLength can be very big.
computation.output = @[]
return
let maxBytes = max(baseLen, max(expLen, modLen))
if maxBytes <= 32:
computation.modExpInternal(base_len, exp_len, mod_len, UInt256)
computation.modExpInternal(baseLen, expLen, modLen, UInt256)
elif maxBytes <= 64:
computation.modExpInternal(base_len, exp_len, mod_len, StUint[512])
computation.modExpInternal(baseLen, expLen, modLen, StUint[512])
elif maxBytes <= 128:
computation.modExpInternal(base_len, exp_len, mod_len, StUint[1024])
computation.modExpInternal(baseLen, expLen, modLen, StUint[1024])
elif maxBytes <= 256:
computation.modExpInternal(base_len, exp_len, mod_len, StUint[2048])
computation.modExpInternal(baseLen, expLen, modLen, StUint[2048])
elif maxBytes <= 512:
computation.modExpInternal(base_len, exp_len, mod_len, StUint[4096])
computation.modExpInternal(baseLen, expLen, modLen, StUint[4096])
elif maxBytes <= 1024:
computation.modExpInternal(base_len, exp_len, mod_len, StUint[8192])
computation.modExpInternal(baseLen, expLen, modLen, StUint[8192])
else:
raise newException(EVMError, "The Nimbus VM doesn't support modular exponentiation with numbers larger than uint8192")

26
tests/test_allowed_to_fail.nim
View File

@ -89,27 +89,16 @@ func slowGSTTests(folder: string, name: string): bool =
"CALLBlake2f_MaxRounds.json",
]
func allowedFailingGeneralStateTest(folder, name: string): bool =
let allowedFailingGeneralStateTests = @[
# conflicts between native int and big int.
# gasFee calculation in modexp precompiled
# contracts
"modexp.json"
]
result = name in allowedFailingGeneralStateTests
func skipGSTTests*(folder: string, name: string): bool =
# we skip tests that are slow or expected to fail for now
if slowGSTTests(folder, name):
return true
result = allowedFailingGeneralStateTest(folder, name)
slowGSTTests(folder, name)
func skipNewGSTTests*(folder: string, name: string): bool =
# share the same slow and failing tests
if skipGSTTests(folder, name):
return true
result = name in @[
name in @[
# py-evm claims these tests are incorrect
# nimbus also agree
"RevertInCreateInInit.json",
@ -121,7 +110,7 @@ func skipVMTests*(folder: string, name: string): bool =
result = (folder == "vmPerformance" and "loop" in name)
func skipBCTests*(folder: string, name: string): bool =
let allowedFailingBCTests = @[
name in @[
# BlockChain slow tests
"SuicideIssue.json",
@ -130,15 +119,13 @@ func skipBCTests*(folder: string, name: string): bool =
"DelegateCallSpam.json"
]
result = name in allowedFailingBCTests
func skipNewBCTests*(folder: string, name: string): bool =
# the new BC tests also contains these slow tests
# for Istanbul fork
if slowGSTTests(folder, name):
return true
let allowedFailingBCTests = @[
name in @[
# Istanbul bc tests
# py-evm claims these tests are incorrect
# nimbus also agree
@ -146,12 +133,7 @@ func skipNewBCTests*(folder: string, name: string): bool =
"RevertInCreateInInitCreate2.json",
"InitCollision.json",
# see allowedFailingGeneralStateTest
"modexp.json",
# BC huge memory consumption
"randomStatetest94.json",
"DelegateCallSpam.json"
]
result = name in allowedFailingBCTests