Core execution refactor, EIP 684, edge case fixes, starting nonce for morden #19

austinabell · 2019-08-02T00:07:20Z

Refactors CALL code executions to not all rely on the same function and perform additional logic
Implements EIP 684
Fixes all edge case tests from Test skips #13
Fixes starting nonce logic for Morden

This does not completely solve the issue from #12 but now the discrepancy is just a gas usage differential and the post state root hashes are matching up with the tx. These changes pass all state tests and I will remove the invalid state tests existing in the repository before that expect the incorrect behaviour and investigate the test failures to try to finish off these tests before opening PR for review.

soc1c · 2019-08-02T15:48:44Z

how much is required to finalize this?

austinabell · 2019-08-02T15:53:21Z

how much is required to finalize this?

Just debugging the gas usage discrepancy, I can give context on how this is very convoluted in the codebase but it shouldn't be a difficult fix. I was waiting to merge in this PR once I solved the consensus bug, and most (I can't say all yet) of the classic failing tests currently are outdated by EIP684 impl

…output to be consistent

austinabell · 2019-08-04T13:25:40Z

Removed failing tests since they are both cases where it as assumed a contract collision will overwrite a contract. PR is ready for review now. Solves all state test discrepancies and the post state root hash was matching on the Morden tx now and was just giving a gas usage error for the tx (and tx receipt because of this) so that issue can be assumed to be seperate from this PR, unless the issue is found before this gets merged in. Closes #13 by implementing final difference, EIP684

austinabell · 2019-08-04T22:28:33Z

I will look into it early tomorrow but I don't see how this is possible, I have synced up many times with this branch and had just done so before opening PR for review.

steviezhang

can confirm gets stuck at block 323.

opcodes from the contract creation tx in the next block (pulled from parity) here
https://pastebin.com/Xpa4pMtu

steviezhang · 2019-08-05T04:38:14Z

@austinabell @soc1c we're stuck on block 323 because block 324 contains the first contract creation transaction and our EIP684 explicitly checks for a nonce of 0 but accounts on morden start with a nonce of 2^20

…or contract collision and empty objects

soc1c · 2019-08-05T08:05:47Z

Good find, I'm resyncing now.

austinabell · 2019-08-06T16:39:07Z

resolves #22, if anyone else can double check

soc1c

works finally.

GregTheGreek · 2019-08-07T10:04:17Z

Syncing... code checks out

GregTheGreek · 2019-08-07T12:14:45Z

@r8d8 @tzdybal Hey please review :)

soc1c · 2019-08-07T12:44:49Z

steviezhang · 2019-08-07T16:29:43Z

Maybe rename it to include the starting nonce details/have it in the description

tzdybal

LGTM. I found only some small "stylistic" issues.

tzdybal · 2019-08-07T16:28:13Z

tests/state_test_util.go

@@ -200,7 +200,7 @@ func runStateTest(ruleSet RuleSet, test VmTest) error {
 		if balance, ok := new(big.Int).SetString(account.Balance, 0); !ok {
 			panic("malformed test account balance")
 		} else if balance.Cmp(obj.Balance()) != 0 {
-			return fmt.Errorf("(%x) balance failed. Expected: %v have: %v\n", obj.Address().Bytes()[:4], account.Balance, obj.Balance())
+			return fmt.Errorf("(%x) balance failed. Expected: %v have: %v\n", obj.Address().Bytes()[:4], account.Balance, "0x"+obj.Balance().Text(16))


You can easily add "0x" inside error format string, not as a concatenation in argument.

tzdybal · 2019-08-07T16:31:08Z

core/execution.go

-	callerAddr := caller.Address()
-	ret, _, err = exec(env, caller, &callerAddr, &addr, env.Db().GetCodeHash(addr), input, env.Db().GetCode(addr), gas, gasPrice, value, false)
+	evm := env.Vm()
+	// Depth check execution. Fail if we're trying to execute above the limit.


This few lines look like a code duplicate, function could be extracted.

tzdybal · 2019-08-07T16:33:24Z

core/execution.go

-	ret, _, err = exec(env, caller, &addr, &addr, env.Db().GetCodeHash(addr), input, env.Db().GetCode(addr), gas, gasPrice, new(big.Int), true)
+	evm := env.Vm()
+	// Depth check execution. Fail if we're trying to execute above the limit.
+	if env.Depth() > callCreateDepthMax {


Another code duplicate

… morden (#19) * Refactored Call * Refactored CallCode * Refactored DelegateCall * Refactored StaticCall * Added create before contract collision check * Refactored Call * Refactored CallCode * Refactored DelegateCall * Refactored StaticCall * Added create before contract collision check * Fixed state transition logic for edge case * Added create collision logic * Fix for edge case tests * Removed outdated contract collision tests and changed format of test output to be consistent * Rename exec function * utilize StartingNonce from state instead of explicit 0 nonce checks for contract collision and empty objects * Fixes morden seg fault edge case * adding starting nonce to created contracts

* Fixed state transition logic for edge case (#17) * Update morden bootnodes (#16) * Updates bootnodes * what a fantastic test :) * Core execution refactor, EIP 684, edge case fixes, starting nonce for morden (#19) * Refactored Call * Refactored CallCode * Refactored DelegateCall * Refactored StaticCall * Added create before contract collision check * Refactored Call * Refactored CallCode * Refactored DelegateCall * Refactored StaticCall * Added create before contract collision check * Fixed state transition logic for edge case * Added create collision logic * Fix for edge case tests * Removed outdated contract collision tests and changed format of test output to be consistent * Rename exec function * utilize StartingNonce from state instead of explicit 0 nonce checks for contract collision and empty objects * Fixes morden seg fault edge case * adding starting nonce to created contracts

austinabell added 14 commits July 31, 2019 21:52

Refactored Call

a4c721e

Refactored CallCode

313670d

Refactored DelegateCall

7676124

Refactored StaticCall

b491ad7

Added create before contract collision check

ae938bb

Refactored Call

614e37f

Refactored CallCode

44d27ed

Refactored DelegateCall

a2659c3

Refactored StaticCall

e1b4d53

Added create before contract collision check

08b8fc4

Fixed state transition logic for edge case

cd84fe3

Added create collision logic

f5025b8

Fix for edge case tests

2fb944c

rebase merge

244d302

soc1c added PR: 0 In Progress Priority: 0 Consensus Type: Core labels Aug 2, 2019

soc1c mentioned this pull request Aug 2, 2019

Backports for 6.0.7-beta #21

Merged

3 tasks

soc1c added the PR: 4 Patch label Aug 2, 2019

Removed outdated contract collision tests and changed format of test …

674e269

…output to be consistent

austinabell marked this pull request as ready for review August 4, 2019 13:25

austinabell requested a review from noot as a code owner August 4, 2019 13:25

Merge branch 'development' into austin/executionrefactor

fb14ab1

austinabell requested review from steviezhang, dziabko and GregTheGreek August 4, 2019 13:27

Rename exec function

e7b4d8b

soc1c added the PR: 3 Grumble label Aug 4, 2019

steviezhang suggested changes Aug 5, 2019

View reviewed changes

utilize StartingNonce from state instead of explicit 0 nonce checks f…

6cc8fde

…or contract collision and empty objects

Fixes morden seg fault edge case

04716ca

austinabell force-pushed the austin/executionrefactor branch from 4267592 to 04716ca Compare August 7, 2019 02:33

adding starting nonce to created contracts

a10e5c6

soc1c approved these changes Aug 7, 2019

View reviewed changes

soc1c requested a review from steviezhang August 7, 2019 10:03

GregTheGreek requested review from tzdybal and r8d8 August 7, 2019 12:13

austinabell mentioned this pull request Aug 7, 2019

Failing tests due to lack of implementation #27

Closed

steviezhang approved these changes Aug 7, 2019

View reviewed changes

GregTheGreek approved these changes Aug 7, 2019

View reviewed changes

austinabell changed the title ~~Core execution refactor, EIP 684 and edge case fixes~~ Core execution refactor, EIP 684, edge case fixes, starting nonce for morden Aug 7, 2019

tzdybal approved these changes Aug 7, 2019

View reviewed changes

soc1c merged commit f129e52 into development Aug 7, 2019

soc1c deleted the austin/executionrefactor branch August 7, 2019 16:59

This was referenced Aug 7, 2019

Refactor execution.go #8

Closed

Test skips #13

Closed

soc1c added this to the 6.0 Atlantis milestone Aug 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Core execution refactor, EIP 684, edge case fixes, starting nonce for morden #19

Core execution refactor, EIP 684, edge case fixes, starting nonce for morden #19

austinabell commented Aug 2, 2019 •

edited

Loading

soc1c commented Aug 2, 2019

austinabell commented Aug 2, 2019

austinabell commented Aug 4, 2019

austinabell commented Aug 4, 2019

steviezhang left a comment

steviezhang commented Aug 5, 2019

soc1c commented Aug 5, 2019

austinabell commented Aug 6, 2019

soc1c left a comment

GregTheGreek commented Aug 7, 2019

GregTheGreek commented Aug 7, 2019

soc1c commented Aug 7, 2019

steviezhang commented Aug 7, 2019

tzdybal left a comment

tzdybal Aug 7, 2019

tzdybal Aug 7, 2019

tzdybal Aug 7, 2019

Core execution refactor, EIP 684, edge case fixes, starting nonce for morden #19

Core execution refactor, EIP 684, edge case fixes, starting nonce for morden #19

Conversation

austinabell commented Aug 2, 2019 • edited Loading

soc1c commented Aug 2, 2019

austinabell commented Aug 2, 2019

austinabell commented Aug 4, 2019

austinabell commented Aug 4, 2019

steviezhang left a comment

Choose a reason for hiding this comment

steviezhang commented Aug 5, 2019

soc1c commented Aug 5, 2019

austinabell commented Aug 6, 2019

soc1c left a comment

Choose a reason for hiding this comment

GregTheGreek commented Aug 7, 2019

GregTheGreek commented Aug 7, 2019

soc1c commented Aug 7, 2019

steviezhang commented Aug 7, 2019

tzdybal left a comment

Choose a reason for hiding this comment

tzdybal Aug 7, 2019

Choose a reason for hiding this comment

tzdybal Aug 7, 2019

Choose a reason for hiding this comment

tzdybal Aug 7, 2019

Choose a reason for hiding this comment

austinabell commented Aug 2, 2019 •

edited

Loading