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

fix rpcmining/getblocktemplate univalue transition logic error #6234

Merged
merged 1 commit into from Jun 5, 2015

Conversation

Projects
None yet
5 participants
@jonasschnelli
Member

jonasschnelli commented Jun 4, 2015

Reported by @sdaftuar (Thanks!).

This fixes a bug that was included in #6121 during the transition from Json Spirit to UniValue.

@sdaftuar

This comment has been minimized.

Show comment
Hide comment
@sdaftuar

sdaftuar Jun 4, 2015

Member

Verified this fixes getblocktemplate_proposals.py, looks good to me.

Member

sdaftuar commented Jun 4, 2015

Verified this fixes getblocktemplate_proposals.py, looks good to me.

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 4, 2015

Member

Here is the code line before the transition (before #6121) to verify the change: https://github.com/bitcoin/bitcoin/blob/0.11/src/rpcmining.cpp#L403

Member

jonasschnelli commented Jun 4, 2015

Here is the code line before the transition (before #6121) to verify the change: https://github.com/bitcoin/bitcoin/blob/0.11/src/rpcmining.cpp#L403

@jgarzik

This comment has been minimized.

Show comment
Hide comment
@jgarzik

jgarzik Jun 4, 2015

Contributor

ACK

Contributor

jgarzik commented Jun 4, 2015

ACK

@fanquake

This comment has been minimized.

Show comment
Hide comment
@fanquake

fanquake Jun 5, 2015

Member

utACK

Member

fanquake commented Jun 5, 2015

utACK

@laanwj laanwj added the RPC/REST/ZMQ label Jun 5, 2015

@laanwj laanwj merged commit ef5fca8 into bitcoin:master Jun 5, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jun 5, 2015

Merge pull request #6234
ef5fca8 fix rpcmining/getblocktemplate univalue transition logic error (Jonas Schnelli)
@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 5, 2015

Member

Thanks

Member

laanwj commented Jun 5, 2015

Thanks

zkbot added a commit to zcash/zcash that referenced this pull request Feb 5, 2017

Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r…
…=<try>

Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.

zkbot added a commit to zcash/zcash that referenced this pull request Feb 7, 2017

Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r…
…=<try>

Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.

zkbot added a commit to zcash/zcash that referenced this pull request Feb 10, 2017

Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r…
…=bitcartel

Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.

zkbot added a commit to zcash/zcash that referenced this pull request Feb 10, 2017

Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r…
…=str4d

Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.

zkbot added a commit to zcash/zcash that referenced this pull request Feb 10, 2017

Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r…
…=str4d

Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment