Skip to content

Enable support for Istanbul#7740

Merged
chriseth merged 10 commits intodevelopfrom
istanbul
Nov 20, 2019
Merged

Enable support for Istanbul#7740
chriseth merged 10 commits intodevelopfrom
istanbul

Conversation

@axic
Copy link
Copy Markdown
Contributor

@axic axic commented Nov 19, 2019

Closes #7310.

Depends on #7655.

@axic axic mentioned this pull request Nov 19, 2019
6 tasks
@axic axic marked this pull request as ready for review November 19, 2019 13:08
@axic
Copy link
Copy Markdown
Contributor Author

axic commented Nov 19, 2019

Updated test expectations in GasCosts.

EVM_VERSIONS+=" constantinople petersburg istanbul"
fi

# And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is the comment below this line still correct?

do
clean
force_solc_settings "$CONFIG" "$optimize" "petersburg"
force_solc_settings "$CONFIG" "$optimize" "istanbul"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This will probably break some tests, but what could one do 😉

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm unsure about the changes in the test scripts.

if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(151455, 127653, evmVersion);
else
CHECK_DEPLOY_GAS(123, 113821, evmVersion);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The 123 here is just not hit by the tests, right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, marked them as 0 in a commit.

if (Options::get().optimizeYul)
CHECK_DEPLOY_GAS(151455, 127653, evmVersion);
{
if (evmVersion < EVMVersion::istanbul())
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It might have been better to directly take the data gas cost change into account and keep the constants.

@chriseth chriseth merged commit 5deaac0 into develop Nov 20, 2019
@chriseth chriseth deleted the istanbul branch November 20, 2019 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support for Istanbul

5 participants