search

chaincoin-legacy / chaincoin

Chaincoin crypto currency
http://www.chaincoin.org/
Other
60 stars 22 forks source link

v12.2 update #92

Closed howardfinter closed 6 years ago

howardfinter commented 6 years ago

This pull request will replace all existing files for v0.9.3.x. There appears to be a bug in the options dialog that doesn't update the settings to show masternodes. I will fix this and do another pull request. It would be good to get others testing this version as soon as possible on the testnet. All updates going forward should have peer review before being merged.

Credits go to pcre, d4ndo & Hash for most of the changes being merge here. I have reviewed all code line by line to the best of my ability. The proof of work & subsidy follow the existing chaincoin codebase. The MN payouts have been changed to account for governance and should be tested to confirm it is working as expected. There are chainparams settings that need to be defined. We can determine these settings as we create a roll-out strategy.

-Samps

suprnurd commented 6 years ago

@howardfinter How are there merge conflicts?

suprnurd commented 6 years ago

I don't understand the thought process here... are you for real??

howardfinter commented 6 years ago

Basically v0.12.0 will replace all the existing code. If you want to track the changes to v0.12 we would need to fork dash in your repo and then do another pull request with our changes. That would be the better option. Otherwise, it will be impossible to track all the changes we made to migrate. What are your thoughts?On Dec 4, 2017 9:38 PM, Alan Rudolf notifications@github.com wrote:I don't understand the thought process here... are you for real??

—You are receiving this because you were mentioned.Reply to this email directly, view it on GitHub, or mute the thread.

howardfinter commented 6 years ago

Otherwise, I can attempt to do a merge and resolve all the conflicts. That just seems overkill since there are so many conflicts between the two codebases. I will do that if you prefer it. I just think there is a lot of room for error.Let me know what you are most comfortable with.On Dec 4, 2017 9:53 PM, Michael wrote:Basically v0.12.0 will replace all the existing code. If you want to track the changes to v0.12 we would need to fork dash in your repo and then do another pull request with our changes. That would be the better option. Otherwise, it will be impossible to track all the changes we made to migrate. What are your thoughts?On Dec 4, 2017 9:38 PM, Alan Rudolf notifications@github.com wrote:I don't understand the thought process here... are you for real??

—You are receiving this because you were mentioned.Reply to this email directly, view it on GitHub, or mute the thread.

suprnurd commented 6 years ago

I think we should have preserved all of the individual commits from the source repos that would have made it easier to see what has been changed and also make reviewing the code much easier.

howardfinter commented 6 years ago

Let me fix it and do another pull request.

suprnurd commented 6 years ago

This was really sad to have to do. I'm ashamed at myself.

pewilliams71 commented 6 years ago

No need to feel that way Alan. This is a pragmatic action. Oversight by the communty continues. Pete (fellowserf)

suprnurd commented 6 years ago

I was referring to actually accepting a pull request like this.

suprnurd commented 6 years ago

@howardfinter Still waiting on you to re-fork the Chaincoin repo and make the community changes to the 0.12.X branch.

howardfinter commented 6 years ago

I will do that tonight.

suprnurd commented 6 years ago

Awesome!!

On Dec 8, 2017 2:16 PM, "Samps" notifications@github.com wrote:

I will do that tonight.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/chaincoin/chaincoin/pull/92#issuecomment-350348012, or mute the thread https://github.com/notifications/unsubscribe-auth/AUOSiIAmaU6GT_YxUo-le04ERDmZDxGXks5s-YsPgaJpZM4Q1rK1 .