status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-24 19:19:21 +00:00
Code Issues Projects Releases Wiki Activity

fix collectTouchedAccounts: msg.destination -> msg.storageAddress, GST +4

Browse Source
This commit is contained in:
andri lim 2019-04-18 10:21:20 +07:00
parent 7c134b481e
commit c07f01a74d
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GeneralStateTests.md
View File

@ -712,9 +712,9 @@ OK: 67/67 Fail: 0/67 Skip: 0/67
```diff
+ NonZeroValue_CALL.json OK
+ NonZeroValue_CALLCODE.json OK
NonZeroValue_CALLCODE_ToEmpty.json Skip
+ NonZeroValue_CALLCODE_ToEmpty.json OK
+ NonZeroValue_CALLCODE_ToNonNonZeroBalance.json OK
NonZeroValue_CALLCODE_ToOneStorageKey.json Skip
+ NonZeroValue_CALLCODE_ToOneStorageKey.json OK
+ NonZeroValue_CALL_ToEmpty.json OK
+ NonZeroValue_CALL_ToNonNonZeroBalance.json OK
+ NonZeroValue_CALL_ToOneStorageKey.json OK
@ -735,7 +735,7 @@ OK: 67/67 Fail: 0/67 Skip: 0/67
+ NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json OK
+ NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json OK
```
OK: 22/24 Fail: 0/24 Skip: 2/24
OK: 24/24 Fail: 0/24 Skip: 0/24
## stPreCompiledContracts
```diff
identity_to_bigger.json Skip
@ -2223,9 +2223,9 @@ OK: 0/24 Fail: 0/24 Skip: 24/24
```diff
+ ZeroValue_CALL.json OK
+ ZeroValue_CALLCODE.json OK
ZeroValue_CALLCODE_ToEmpty.json Skip
+ ZeroValue_CALLCODE_ToEmpty.json OK
+ ZeroValue_CALLCODE_ToNonZeroBalance.json OK
ZeroValue_CALLCODE_ToOneStorageKey.json Skip
+ ZeroValue_CALLCODE_ToOneStorageKey.json OK
+ ZeroValue_CALL_ToEmpty.json OK
+ ZeroValue_CALL_ToNonZeroBalance.json OK
+ ZeroValue_CALL_ToOneStorageKey.json OK
@ -2246,7 +2246,7 @@ OK: 0/24 Fail: 0/24 Skip: 24/24
+ ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json OK
+ ZeroValue_TransactionCALLwithData_ToOneStorageKey.json OK
```
OK: 22/24 Fail: 0/24 Skip: 2/24
OK: 24/24 Fail: 0/24 Skip: 0/24
## stZeroKnowledge
```diff
ecmul_1-2_2_28000_128.json Skip
@ -2520,4 +2520,4 @@ OK: 5/133 Fail: 0/133 Skip: 128/133
OK: 0/130 Fail: 0/130 Skip: 130/130
---TOTAL---
OK: 1496/2334 Fail: 0/2334 Skip: 838/2334
OK: 1500/2334 Fail: 0/2334 Skip: 834/2334

2
nimbus/p2p/executor.nim
View File

@ -56,8 +56,8 @@ proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMSta
# EIP158 state clearing
for account in vmState.touchedAccounts:
debug "state clearing", account
if db.accountExists(account) and db.isEmptyAccount(account):
debug "state clearing", account
db.deleteAccount(account)
result = gasUsed

6
nimbus/vm/computation.nim
View File

@ -305,10 +305,10 @@ proc collectTouchedAccounts*(c: BaseComputation, output: var HashSet[EthAddress]
if c.isError and c.isOriginComputation:
# Special case to account for geth+parity bug
# https://github.com/ethereum/EIPs/issues/716
if cmpThree(c.msg.destination):
output.incl c.msg.destination
if cmpThree(c.msg.storageAddress):
output.incl c.msg.storageAddress
else:
output.incl c.msg.destination
output.incl c.msg.storageAddress
if not c.isOriginComputation or not c.isError:
for child in c.children:

10
tests/test_generalstate_failing.nim
View File

@ -29,13 +29,13 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"failed_tx_xcf416c53.json",
"createNameRegistratorPerTxsNotEnoughGasAfter.json",
"createNameRegistratorPerTxsNotEnoughGasAt.json",
"createNameRegistratorPerTxsNotEnoughGasBefore.json",
"ZeroValue_CALLCODE_ToEmpty.json",
"ZeroValue_CALLCODE_ToOneStorageKey.json",
"NonZeroValue_CALLCODE_ToEmpty.json",
"NonZeroValue_CALLCODE_ToOneStorageKey.json",
"createNameRegistratorPerTxsNotEnoughGasBefore.json",
"TransactionSendingToZero.json"
#"ZeroValue_CALLCODE_ToEmpty.json",
#"ZeroValue_CALLCODE_ToOneStorageKey.json",
#"NonZeroValue_CALLCODE_ToEmpty.json",
#"NonZeroValue_CALLCODE_ToOneStorageKey.json",
#"suicideCoinbase.json",
#"EmptyTransaction2.json",
#"SuicidesMixingCoinbase.json",