Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Agharta/eip1014 create2 #20

Merged
merged 68 commits into from
Sep 3, 2019
Merged

Conversation

soc1c
Copy link
Contributor

@soc1c soc1c commented Aug 2, 2019

reapplying #5, can you make that mergable @dziabko? :)

dziabko and others added 30 commits May 31, 2019 16:01
* Added Atlantis fork in builtin mainnet and morden config

* Fixed difficulty test at 10_000_000 block (Atlantis)

* Added tests for Atlantis difficulty transition
* wip makefile updates

* Fixed makefile and updated README

* Fixed readme changes

* Added go module documentation and fixed wiki links to EP

* Added go modules on for makefile commands and documentation
* Added Dockerfile setup

* Added Dockerfile setup

* Fixed build command

* Removed private repo authentication in Dockerfile
* docs: update readme

* Update README.md

* Update README.md
* ci: prepare assets for release

* ci: fix indentation

* ci: fix indentation

* ci: fix indentation

* ci: fix indentation

* ci: release in build step

* ci: calculate sha256sums

* ci: store artifacts

* ci: do a reverse copy

* ci: fix bash syntax

* ci: indicate os in release

* ci: pushd and pop'd ;)
* receipt and state trie clearing changes

* Fixed receipt storage and added backward compatible decoding
* Added Atlantis fork in builtin mainnet and morden config

* Fixed difficulty test at 10_000_000 block (Atlantis)

* Added tests for Atlantis difficulty transition
Copy link
Contributor

@austinabell austinabell left a comment

Choose a reason for hiding this comment

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

See other PR for other changes to be done relating to Create2, but the logic for Create should not be changed in this PR

tests/state_test.go Outdated Show resolved Hide resolved
core/execution.go Outdated Show resolved Hide resolved
core/execution.go Outdated Show resolved Hide resolved
Copy link
Contributor

@austinabell austinabell left a comment

Choose a reason for hiding this comment

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

Couple small details and then I'm good with it

core/execution.go Show resolved Hide resolved
tests/state_test.go Outdated Show resolved Hide resolved
core/execution.go Outdated Show resolved Hide resolved
core/execution.go Outdated Show resolved Hide resolved
core/execution.go Show resolved Hide resolved
Copy link
Contributor

@austinabell austinabell left a comment

Choose a reason for hiding this comment

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

Small change and I'll be good to merge this into the branch off development

core/execution.go Outdated Show resolved Hide resolved
core/execution.go Outdated Show resolved Hide resolved
…dress from pointer to a regular in create().
@austinabell austinabell changed the base branch from development to agharta/dev August 22, 2019 15:39
Copy link
Contributor

@austinabell austinabell left a comment

Choose a reason for hiding this comment

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

lgtm

@steviezhang steviezhang self-requested a review August 28, 2019 19:43
@GregTheGreek GregTheGreek merged commit 99a52af into agharta/dev Sep 3, 2019
@soc1c soc1c deleted the agharta/eip1014-create2 branch September 5, 2019 08:49
@soc1c
Copy link
Contributor Author

soc1c commented Sep 5, 2019

WTF why did you change the base branch @austinabell

@soc1c soc1c restored the agharta/eip1014-create2 branch September 5, 2019 08:51
@soc1c
Copy link
Contributor Author

soc1c commented Sep 5, 2019

the entire point of this PR is getting this into development!!!

@austinabell
Copy link
Contributor

@soc1c The agharta changes haven't even been approved by the community, why would we merge them into development now? There is no functional change what would be the benefit to this?

agharta/dev was just recently branched off of development so it would be ready to merge in whenever the changes are intended to be introduced (and would cause less conflict with the rename if grouped together)

@soc1c
Copy link
Contributor Author

soc1c commented Sep 5, 2019

development is unstable. everything goes into development

community approval is unrelated to our dev work

@GregTheGreek
Copy link
Contributor

have we re-megred this onto dev? @soc1c is correct..

@austinabell
Copy link
Contributor

Just did it because that was what I was told to hahah, I changed other agharta PR's base and referenced new PR

@soc1c soc1c deleted the agharta/eip1014-create2 branch September 20, 2019 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants