Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache #9234

sorpaas · 2018-07-27T09:40:30Z

Previously, if a cache operation on an account failed, then we print an error message, but silently ignore the error, and act as if the code on that account is empty. This PR fixes that issue to properly return TrieError.
In state interface, allow the query to code to return Option. This makes it possible to distinguish account that does not exist, and account that does not have code.
Implement EIP-1052 EXTCODEHASH.

debris

LGTM! @andresilva can you also review this pr?

debris · 2018-07-30T12:38:17Z

ethcore/evm/src/interpreter/mod.rs

@@ -590,7 +596,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 			},
 			instructions::EXTCODECOPY => {
 				let address = u256_to_address(&stack.pop_back());
-				let code = ext.extcode(&address)?;
+				let code = ext.extcode(&address)?.unwrap_or(Arc::new(Vec::new()));


maybe match over here instead of unwrap_or ? I believe that we could avoid Arc and Vec allocations

debris · 2018-07-30T12:44:15Z

ethcore/src/state/mod.rs

+		}) {
+			Some(r) => Some(r?),
+			None => None,
+		};


can you merge this match with the next match?

andresilva

LGTM overall, just some minor comments. Regarding tests, I assume this will be tested with jsontests in the future?

andresilva · 2018-07-30T16:29:51Z

ethcore/evm/src/interpreter/mod.rs

+				Self::copy_data_to_memory(
+					&mut self.mem,
+					stack,
+					code.as_ref().map(|c| &c.deref()[..]).unwrap_or(&[])


I think code.as_ref().map(|c| &(*c)[..]).unwrap_or(&[]) should compile. Not sure if that's preferable though.

andresilva · 2018-07-30T16:38:28Z

ethcore/src/state/mod.rs

-	// load required account data from the databases.
-	fn update_account_cache(require: RequireCache, account: &mut Account, state_db: &B, db: &HashDB<KeccakHasher>) {
+	/// Load required account data from the databases. Returns whether the cache succeeds.
+	#[must_use]


👍 We should probably use this more.

andresilva · 2018-07-30T16:47:10Z

ethcore/evm/src/interpreter/mod.rs

 				stack.push(U256::from(len));
 			},
+			instructions::EXTCODEHASH => {
+				let address = u256_to_address(&stack.pop_back());
+				let hash = ext.extcodehash(&address)?.unwrap_or_else(H256::default);


Prefer H256::zero to make it more explicit?

sorpaas · 2018-07-31T03:51:09Z

@andresilva Yeah, I think testing this with jsontests would make most sense.

* 'master' of https://github.com/paritytech/parity: removed client error (openethereum#9253) Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache (openethereum#9234) Improve Tracer documentation (openethereum#9237) Update Dockerfile (openethereum#9242) block cleanup (openethereum#9117) Increase the number of sessions. (openethereum#9203) add changelog for 1.11.8 stable and 2.0.1 beta (openethereum#9230) fix typo (openethereum#9232) Fix potential as_usize overflow when casting from U256 in miner (openethereum#9221) Allow old blocks from peers with lower difficulty (openethereum#9226) Removes duplicate libudev-dev from Dockerfile (openethereum#9220) snap: remove ssl dependencies from snapcraft definition (openethereum#9222) remove ssl from dockerfiles, closes openethereum#8880 (openethereum#9195) Insert PROOF messages for some cases in blockchain (openethereum#9141) [Chain] Add more bootnodes (openethereum#9174) ethcore: update bn version (openethereum#9217) deserialize block only once during verification (openethereum#9161) Simple build instruction fix (openethereum#9215) Added --tx-queue-no-early-reject flag to disable early tx queue rejects (openethereum#9143)

…unt cache (#9234) * Implement EIP-1052 and fix several issues related to account cache * Fix jsontests * Merge two matches together * Avoid making unnecessary Arc<Vec> * Address grumbles

* ethash: implement EIP-1234 (#9187) * Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache (#9234) * Implement EIP-1052 and fix several issues related to account cache * Fix jsontests * Merge two matches together * Avoid making unnecessary Arc<Vec> * Address grumbles * Comply EIP-86 with the new definition (#9140) * Comply EIP-86 with the new CREATE2 opcode * Fix rpc compile * Fix interpreter CREATE/CREATE2 stack pop difference * Add unreachable! to fix compile * Fix instruction_info * Fix gas check due to new stack item * Add new tests in executive * Fix have_create2 comment * Remove all unused references of eip86_transition and block_number * Implement KIP4: create2 for wasm (#9277) * Basic implementation for kip4 * Add KIP-4 config flags * typo: docs fix * Fix args offset * Add tests for create2 * tests: evm * Update wasm-tests and fix all gas costs * Update wasm-tests * Update wasm-tests and fix gas costs * `gasleft` extern implemented for WASM runtime (kip-6) (#9357) * Wasm gasleft extern added * wasm_gasleft_activation_transition -> kip4_transition * use kip-6 switch * gasleft_panic -> gasleft_fail rename * call_msg_gasleft test added and gas_left agustments because this openethereum/wasm-tests#52 * change .. to _ * fix comment for the have_gasleft param * update tests (openethereum/wasm-tests@0edbf86) * Add EIP-1014 transition config flag (#9268) * Add EIP-1014 transition config flag * Remove EIP-86 configs * Change CREATE2 opcode index to 0xf5 * Move salt to the last item in the stack * Change sendersaltandaddress scheme to comply with current EIP-1014 * Fix json configs * Fix create2 test * Fix deprecated comments * EIP 1283: Net gas metering for SSTORE without dirty maps (#9319) * Implement last_checkpoint_storage_at * Add reverted_storage_at for externalities * sstore_clears_count -> sstore_clears_refund * Implement eip1283 for evm * Add eip1283Transition params * evm: fix tests * jsontests: fix test * Return checkpoint index when creating * Comply with spec Version II * Fix docs * Fix jsontests feature compile * Address grumbles * Fix no-checkpoint-entry case * Remove unnecessary expect * Add test for State::checkpoint_storage_at * Add executive level test for eip1283 * Hard-code transaction_checkpoint_index to 0 * Fix jsontests * Add tests for checkpoint discard/revert * Require checkpoint to be empty for kill_account and commit * Get code coverage * Use saturating_add/saturating_sub * Fix issues in insert_cache * Clear the state again * Fix original_storage_at * Early return for empty RLP trie storage * Update comments * Fix borrow_mut issue * Simplify checkpoint_storage_at if branches * Better commenting for gas handling code * Address naming grumbles * More tests * Fix an issue in overwrite_with * Add another test * Fix comment * Remove unnecessary bracket * Move orig to inner if * Remove test coverage for this PR * Add tests for executive original value * Add warn! for an unreachable cause * Update state tests execution model (#9440) * Update & fix JSON state tests. * Update tests to be able to run ethtest at 021fe3d410773024cd5f0387e62db6e6ec800f32. - Touch user in state - Adjust transaction tests to new json format * Switch to same commit for submodule ethereum/test as geth (next includes constantinople changes). Added test `json_tests::trie::generic::TrieTests_trieanyorder` and a few difficulty tests. * Remove trietestnextprev as it would require to parse differently and implement it. * Support new (shitty) format of transaction tests. * Ignore junk in ethereum/tests repo. * Ignore incorrect test. * Update to a later commit * Move block number to a constant. * Fix ZK2 test - touched account should also be cleared. * Fix conflict resolution * Fix checkpointing when creating contract failed (#9514) * In create memory calculation is the same for create2 because the additional parameter was popped before. (#9522) * Enable all Constantinople hard fork changes in constantinople_test.json (#9505) * Enable all Constantinople hard fork changes in constantinople_test.json * Address grumbles * Remove EIP-210 activation * 8m -> 5m * Temporarily add back eip210 transition so we can get test passed * Add eip210_test and remove eip210 transition from const_test * Add constantinople conf to EvmTestClient. (#9570) * Add constantinople conf to EvmTestClient. * Skip some test to update submodule etheureum/tests submodule to latest. * Put skipping 'under issue' test behind a feature. * Change blockReward for const-test to pass ethereum/tests * Update tests to new constantinple definition (change of reward at block 5). Switch 'reference' to string, that way we can include issues from others repo (more flexible)Update tests to new constantinple definition (change of reward at block 5). Switch 'reference' to string, that way we can include issues from others repo (more flexible). * Fix modexp and bn128_mul gas prices in chain config * Changes `run_test_path` method to append its directory results (without that it stop testing at the first file failure). Add some missing tests. Add skip for those (block create2 is one hundred percent false but on hive we can see that geth and aleth got similar issue for this item). * retab current.json * Update reference to parity issue for failing tests. * Hardfork the testnets (#9562) * ethcore: propose hardfork block number 4230000 for ropsten * ethcore: propose hardfork block number 9000000 for kovan * ethcore: enable kip-4 and kip-6 on kovan * etcore: bump kovan hardfork to block 9.2M * ethcore: fix ropsten constantinople block number to 4.2M * ethcore: disable difficulty_test_ropsten until ethereum/tests are updated upstream * Don't hash the init_code of CREATE. (#9688) * Implement CREATE2 gas changes and fix some potential overflowing (#9694) * Implement CREATE2 gas changes and fix some potential overflowing * Ignore create2 state tests * Split CREATE and CREATE2 in gasometer * Generalize rounding (x + 31) / 32 to to_word_size * ethcore: delay ropsten hardfork (#9704) * Add hardcoded headers (#9730) * add foundation hardcoded header #6486017 * add ropsten hardcoded headers #4202497 * add kovan hardcoded headers #9023489 * gitlab ci: releasable_branches: change variables condition to schedule (#9729) * HF in POA Core (2018-10-22) (#9724) poanetwork/poa-chain-spec#87

sorpaas added 2 commits July 27, 2018 17:32

Implement EIP-1052 and fix several issues related to account cache

240c49b

Fix jsontests

f1c9566

sorpaas added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Jul 27, 2018

sorpaas added this to the 2.1 milestone Jul 27, 2018

5chdn mentioned this pull request Jul 27, 2018

Constantinople Release #8427

Closed

6 tasks

debris approved these changes Jul 30, 2018

View reviewed changes

debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jul 30, 2018

sorpaas added 2 commits July 30, 2018 22:03

Merge two matches together

e21423e

Avoid making unnecessary Arc<Vec>

48e2c7c

andresilva approved these changes Jul 30, 2018

View reviewed changes

Souptacular mentioned this pull request Jul 30, 2018

Constantinople Progress Tracker ethereum/pm#53

Closed

Address grumbles

5c1cd0a

sorpaas merged commit 29baccd into master Jul 31, 2018

sorpaas deleted the sp-extcodehash branch July 31, 2018 05:28

andresilva mentioned this pull request Oct 9, 2018

[stable] Backport constantinople changes #9723

Merged

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache #9234

Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache #9234

sorpaas commented Jul 27, 2018

debris left a comment

debris Jul 30, 2018

debris Jul 30, 2018

andresilva left a comment

andresilva Jul 30, 2018

andresilva Jul 30, 2018

andresilva Jul 30, 2018

sorpaas commented Jul 31, 2018

Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache #9234

Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache #9234

Conversation

sorpaas commented Jul 27, 2018

debris left a comment

Choose a reason for hiding this comment

debris Jul 30, 2018

Choose a reason for hiding this comment

debris Jul 30, 2018

Choose a reason for hiding this comment

andresilva left a comment

Choose a reason for hiding this comment

andresilva Jul 30, 2018

Choose a reason for hiding this comment

andresilva Jul 30, 2018

Choose a reason for hiding this comment

andresilva Jul 30, 2018

Choose a reason for hiding this comment

sorpaas commented Jul 31, 2018