Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

EIP 158 + 160 protocol update #3381

Merged
merged 25 commits into from
Nov 23, 2016
Merged

EIP 158 + 160 protocol update #3381

merged 25 commits into from
Nov 23, 2016

Conversation

chriseth
Copy link
Contributor

@chriseth chriseth commented Oct 26, 2016 •
edited by winsvega
Loading

This implements ethereum/EIPs#158 and ethereum/EIPs#160 and ethereum/EIPs#170

Still to do:

@chriseth chriseth force-pushed the eip158 branch 2 times, most recently from c6b2d44 to 2c8757b Compare October 27, 2016 10:20
chfast
chfast reviewed Oct 27, 2016
View reviewed changes
Copy link
Member

@chfast chfast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We must merge #3378 first and rebase this one.

libethereum/Block.cpp
@@ -688,7 +689,7 @@ void Block::performIrregularModifications()
Addresses allDAOs = childDaos();
for (Address const& dao: allDAOs)
m_state.transferBalance(dao, recipient, m_state.balance(dao));
m_state.commit();
m_state.commit(false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These bool flags are very annoying. Can you try using enum: bool?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, let's convert this into an enum - although I'm not sure if : bool is required.

@chriseth
Copy link
Contributor Author

Short test against solidity caused this:

eth: /home/christian/ethereum/cpp-ethereum/libethereum/Account.h:160: h256 dev::eth::Account::codeHash() const: Assertion `!isFreshCode()' failed.

@chfast
Copy link
Member

chfast commented Oct 27, 2016

What test?

@chriseth
Copy link
Contributor Author

just the solidity end to end tests

@chriseth
Copy link
Contributor Author

Sorry, false alarm, I think I did not include your fixes to the other PR.

@winsvega
Copy link
Contributor

suicide issue test failing

@chriseth
Copy link
Contributor Author

@chfast Build error on both windows and linux - could you please take a look?

In file included from /home/travis/build/ethereum/cpp-ethereum/libevm/VMFactory.cpp:23:0:

/home/travis/build/ethereum/cpp-ethereum/libevm/JitVM.h:3:20: fatal error: evmjit.h: No such file or directory

 #include <evmjit.h>

@chriseth chriseth force-pushed the eip158 branch 2 times, most recently from 06198df to 6b29490 Compare November 4, 2016 08:54
@chriseth
Copy link
Contributor Author

chriseth commented Nov 4, 2016

Rebased and squashed some commits.

@winsvega winsvega mentioned this pull request Nov 10, 2016
Merged
@chriseth chriseth mentioned this pull request Nov 14, 2016
Closed
chriseth
chriseth commented Nov 22, 2016
View reviewed changes
scripts/tests.bat
@@ -33,6 +33,7 @@ if "%TESTS%"=="On" (
REM Clone the end-to-end test repo, and point environment variable at it.
cd ..
git clone --depth 1 https://github.com/ethereum/tests.git
git checkout eip158
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the tests repo and remove this before merging.

Copy link
Contributor

@winsvega winsvega Nov 22, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. this is to see the green tests

@winsvega winsvega force-pushed the eip158 branch 5 times, most recently from b553839 to f76ce6c Compare November 23, 2016 12:14
chfast
chfast suggested changes Nov 23, 2016
View reviewed changes
.gitmodules
@@ -6,3 +6,7 @@
path = evmjit
url = https://github.com/ethereum/evmjit
branch = develop
[submodule "libjson-rpc-cpp"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed in develop branch so it should not be here.

@chriseth chriseth merged commit f01958b into develop Nov 23, 2016
@axic
Copy link
Member

axic commented Nov 28, 2016

@winsvega @chriseth commit 9d6a293 rolled back the LLL changes :(

@chriseth
Copy link
Contributor Author

Argh, could you please fix that, @winsvega ?

@axic axic deleted the eip158 branch December 2, 2016 10:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@winsvega winsvega winsvega left review comments

@chfast chfast chfast approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chriseth @chfast @winsvega @axic