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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Feb 20, 2019
Merged

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

merged 2 commits into from
Feb 20, 2019

Conversation

nathanielhourt
Copy link
Contributor

@nathanielhourt nathanielhourt commented Feb 15, 2019 •
edited
Loading

Replaces #1585
See #1591 for rationale

@nathanielhourt nathanielhourt mentioned this pull request Feb 15, 2019
Closed
@pmconrad
Copy link
Contributor

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 the Future Feature Release milestone Feb 16, 2019
@oxarbitrage
Copy link
Member

@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.

@nathanielhourt
Convert .txt to .md
7a45e60 
Change the genesis-dev-key.txt file to README-dev.md
@nathanielhourt
Copy link
Contributor Author

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

OK, done

pmconrad
pmconrad approved these changes Feb 19, 2019
View reviewed changes
Copy link
Contributor

@pmconrad pmconrad left a comment

Choose a reason for hiding this comment

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

Good, thanks!

@nathanielhourt nathanielhourt merged commit ef2d563 into bitshares:develop Feb 20, 2019
@nathanielhourt nathanielhourt deleted the genesis-dev branch February 20, 2019 21:35
@MichelSantos MichelSantos mentioned this pull request May 1, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pmconrad pmconrad pmconrad approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.1.0 - Feature Release
Development

Successfully merging this pull request may close these issues.
4 participants
@nathanielhourt @pmconrad @oxarbitrage @abitmore