Skip to content
This repository was archived by the owner on Jul 1, 2021. It is now read-only.

Remove constantinople fork from mainnet launch cfg #174

Merged
merged 3 commits into from
Jan 18, 2019

Conversation

carver
Copy link
Contributor

@carver carver commented Jan 15, 2019

What was wrong?

Constantinople likely to be postponed due to re-entrancy concerns.

See:

How was it fixed?

Removed the Constantinople fork number from the mainnet json config
Set fork block number by 9876543210

Cute Animal Picture

put a cute animal picture link inside the parentheses

@carver
Copy link
Contributor Author

carver commented Jan 15, 2019

working on the py-evm changes

@carver
Copy link
Contributor Author

carver commented Jan 15, 2019

Blocked on py-evm release. trinity core tests pass when py-evm source is at tip of ethereum/py-evm#1717

@carver
Copy link
Contributor Author

carver commented Jan 15, 2019

Testing out this PR as a patch against the last release, in #176

@carver carver force-pushed the cancel-constantinople branch from d8b289b to d612e6f Compare January 17, 2019 04:16
@carver carver force-pushed the cancel-constantinople branch from d612e6f to dc5217d Compare January 17, 2019 23:14
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.2.0-alpha.37
current_version = 0.1.0-alpha.22
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change will be needed to do our first regular bumpversion release on trinity.

@@ -21,7 +21,7 @@
"eth-utils>=1.3.0,<2",
"ipython>=6.2.1,<7.0.0",
"plyvel==1.0.5",
"py-evm==0.2.0a38",
"py-evm==0.2.0a40",
Copy link
Contributor Author

@carver carver Jan 17, 2019

Choose a reason for hiding this comment

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

This is the latest version of py-evm that includes the constantiNOPEle change. 41 is the patch release that's actually an older version of py-evm.

@@ -94,7 +94,7 @@
setup(
name='trinity',
# *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
version='0.1.0-alpha.20',
version='0.1.0-alpha.22',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This got updated in the patch release, which is not in master.

@carver carver requested a review from cburgdorf January 18, 2019 00:34
@carver carver merged commit 8cedd05 into ethereum:master Jan 18, 2019
@carver carver deleted the cancel-constantinople branch January 18, 2019 19:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants