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

Include pruned state in chaininfo.json #6457

Merged
merged 2 commits into from Jul 20, 2015
Merged

Include pruned state in chaininfo.json #6457

merged 2 commits into from Jul 20, 2015

Conversation

@sime
Copy link
Contributor

@sime sime commented Jul 18, 2015

No description provided.

@paveljanik
Copy link
Contributor

@paveljanik paveljanik commented Jul 19, 2015

When you are at it, can you please document "softforks" (from #6353) in the doc/REST-interface.md file?

Please also add "pruned" and "pruneheight" into helptext here https://github.com/bitcoin/bitcoin/blob/master/src/rpcblockchain.cpp#L597 to make it complete.

@sime
Copy link
Contributor Author

@sime sime commented Jul 19, 2015

@paveljanik I've included the extra documentation. should doc/REST-interface.md go into the array contents of softforks? As I have only include the upper most level.

@jonasschnelli
Copy link
Member

@jonasschnelli jonasschnelli commented Jul 20, 2015

ACK

@laanwj
Copy link
Member

@laanwj laanwj commented Jul 20, 2015

LGTM, ACK

@laanwj laanwj merged commit 0ef9858 into bitcoin:master Jul 20, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Jul 20, 2015
0ef9858 Documenting pruned, pruneheight and softforks in getblockchaininfo (Simon Males)
0c89579 Include pruned state in chaininfo.json (Simon Males)
@laanwj laanwj added the Docs label Jul 20, 2015
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 28, 2015
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.