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

Resolve #1591: Relocate genesis and add dev genesis #1592

Merged
merged 2 commits into from Feb 20, 2019

Conversation

Projects
4 participants
@nathanhourt
Copy link
Contributor

commented Feb 15, 2019

Replaces #1585
See #1591 for rationale

@nathanhourt nathanhourt referenced this pull request Feb 15, 2019

Closed

Add genesis-dev.json #1585

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Feb 16, 2019

Thanks!
Please rename the .txt file to README-dev.txt or sth like that.

@oxarbitrage I think this will produce a merge conflict when moving to testnet. Need to move the testnet genesis file also to libraries/egenesis.

@abitmore abitmore added this to In development in Feature Release (3.1.0) via automation Feb 16, 2019

@abitmore abitmore added this to the Future Feature Release milestone Feb 16, 2019

@oxarbitrage

This comment has been minimized.

Copy link
Member

commented Feb 18, 2019

@pmconrad Here is what i think but not fully sure if it is the best we can do:

  • Merge this pull request to develop.
  • Create pull request in the testnet to move the genesis file and update the CMakeLists.txt
  • If any conflict when merging develop to testnet happen in the next release(201904), choose to keep the changes of the testnet side.

Let me know, thanks.

Convert .txt to .md
Change the genesis-dev-key.txt file to README-dev.md
@nathanhourt

This comment has been minimized.

Copy link
Contributor Author

commented Feb 19, 2019

Thanks!
Please rename the .txt file to README-dev.txt or sth like that.

OK, done

@pmconrad
Copy link
Contributor

left a comment

Good, thanks!

@nathanhourt nathanhourt merged commit ef2d563 into bitshares:develop Feb 20, 2019

2 checks passed

ci/dockercloud Your tests passed in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

Feature Release (3.1.0) automation moved this from In development to Done Feb 20, 2019

@nathanhourt nathanhourt deleted the nathanhourt:genesis-dev branch Feb 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.