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

Merge Develop in Master #336

Merged
merged 284 commits into from Oct 23, 2014
Merged

Merge Develop in Master #336

merged 284 commits into from Oct 23, 2014

Conversation

ouziel-slama
Copy link
Contributor

No description provided.

@adamkrellenstein
Copy link
Member

How are we feeling about this, @JahPowerBit, @btcdrak, @xnova? Any problems running Counterwallet with it? Any problems with the new consensus-checking code?

@btcdrak
Copy link
Contributor

btcdrak commented Oct 23, 2014

This PR really got too big huh? 😸
I have looked over the code and I dont see anything objectionable. Not sure I could go as far as saying it's OK, but testnet is running.

Just a thought for future, when a version is ready with "protocol change" save that to a separate branch then merge those into master when you're happy with it. It means you can work on imperfections for later protocol changes that may not yet be ready for mainnet. This super develop branch thing is not idea for good QA.

@adamkrellenstein
Copy link
Member

@btcdrak, @JahPowerBit, What do you think about making this PR without the consensus checks and without the dividend fee protocol change, at least for now? (Then it'll really be just the multi-sig and the test suite, right?)

@adamkrellenstein
Copy link
Member

I'm inclined to merge it. @JahPowerBit, if you're OK with it, then I'll do the merge.

@ouziel-slama
Copy link
Contributor Author

yeah sure! step by step is not bad! I just download the bootstrap database and launch a reparse with consensus, and works well.. but I'am not against keeping that on develop for more testing.
Just there is a problem with countepartyd_build and the database lock: when I stop counterpartyd with service counterpartyd restart/stop the .lock file is not removed, and counterpartyd stuck on "connecting to the database" step. Not sure what the best solution to resolve that (use always --force or change the way that counteparty_build stop the daemon).

@adamkrellenstein
Copy link
Member

Make an issue for that---seems minor.

I'm going to merge this in a couple of minutes, without splitting it up.

adamkrellenstein added a commit that referenced this pull request Oct 23, 2014
@adamkrellenstein adamkrellenstein merged commit abb1546 into master Oct 23, 2014
@robby-d
Copy link
Contributor

robby-d commented Oct 23, 2014

Ouziel, the command you specified is the old command... Does it still not stop properly with "sv stop counterpartyd"? (which is runit)... I haven't run into this with the new command (based on runit)

@robby-d
Copy link
Contributor

robby-d commented Oct 23, 2014

Do the build scripts or launch commands need to be changed any? Anything else that may impact the build system?

@adamkrellenstein
Copy link
Member

The only recent change is that you need to write the server in counterpartyd.py server explicitly. That may already be in master though. (Not in front of my computer.)

@ouziel-slama
Copy link
Contributor Author

@xnova , yes just test on the beta server with sv restart ... It stuck at Status: Checking version.. To restart you need to sv stop .., delete ~/.config/counterpartyd/counterpartyd.9.db.lock then sv start...

@robby-d
Copy link
Contributor

robby-d commented Oct 23, 2014

Is this just how it is? If so, we can modify the sv run script to issue this rm call after the counterpartyd invocation, whuch means after cpd exits/returns, it will remove the lock file

@ouziel-slama
Copy link
Contributor Author

@xnova, yep. Don't find in counterpartd_build a way to make that (Seems there just a file run for each service)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants