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

Sync upstream comment and error improvements. #206

Merged
merged 11 commits into from
May 23, 2016

Conversation

davecgh
Copy link
Member

@davecgh davecgh commented May 21, 2016

Upstream commits:

The instructions for the upstream Gentoo do not apply to Decred since they aren't available. The commit has been turned into a noop in the merge.

dajohi and others added 11 commits October 27, 2015 10:05
No functional change. Add tests.
This commit implements the changeover logic for version 4 blocks as
described by BIP0065.
Calculate rate*fee first before dividing by 1000.
Add more unit tests around the fee calculations.
rpcserver:
If the locktime is given, the transaction inputs will be set to a
non-max value, activating the locktime.  The locktime for the
new transaction will be set to the given value.

This mimics Bitcoin Core commit 212bcca92089f406d9313dbe6d0e1d25143d61ff
In the presence of overflow, the actual output sum is still not
negative and should not be reported as so.
@cjepson
Copy link
Contributor

cjepson commented May 23, 2016

utACK

@alexlyp
Copy link
Member

alexlyp commented May 23, 2016

OK

@alexlyp alexlyp merged commit e8e81fe into decred:master May 23, 2016
@davecgh davecgh deleted the merge_unnecessary_check branch May 23, 2016 19:09
@jcvernaleo jcvernaleo added this to the v0.1.4 milestone May 25, 2016
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.

9 participants