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

Bitcoin 0.12 cleanup PRs 2 #4268

Merged
merged 21 commits into from
Dec 18, 2019
Merged

Bitcoin 0.12 cleanup PRs 2 #4268

merged 21 commits into from
Dec 18, 2019

Conversation

Ian T and others added 20 commits December 17, 2019 12:18
The `generate` RPC has no default `numblocks` and a numeric value is required.
* Introduce new constant MIN_CHANGE and use it instead of the
hardcoded "CENT"
* Add test case for MIN_CHANGE
* Introduce new constant for -mintxfee default:
  DEFAULT_TRANSACTION_MINFEE = 1000
* Don't allow off-by-one or more
* Make clear dust is coupled with minRelayTxFee
* Check rounding for odd values
@str4d str4d added C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. C-cleanup Category: PRs that clean code up or issues documenting cleanup. labels Dec 17, 2019
@str4d str4d requested a review from daira December 17, 2019 18:32
@str4d
Copy link
Contributor Author

str4d commented Dec 17, 2019

This PR only requires one review, as it's all general changes that don't affect consensus or risk user funds.

@ebfull
Copy link
Contributor

ebfull commented Dec 18, 2019

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

📌 Commit 136e1c0 has been approved by ebfull

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

⌛ Testing commit 136e1c0 with merge 8713d73daf5bc13f633986ef08d8920d4a64cbb9...

@str4d str4d removed the request for review from daira December 18, 2019 19:47
@str4d str4d added this to the v2.1.1 milestone Dec 18, 2019
@str4d str4d mentioned this pull request Dec 18, 2019
@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

💔 Test failed - pr-merge

@ebfull
Copy link
Contributor

ebfull commented Dec 18, 2019

@zkbot retry

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

⌛ Testing commit 136e1c0 with merge 2da77edbfed83c8add78e4cefe172d2e4fea066c...

@str4d str4d mentioned this pull request Dec 18, 2019
@str4d
Copy link
Contributor Author

str4d commented Dec 18, 2019

The retry will fail, because the test failed due to the "absurdly high fee" bound being altered (and changing the error message). When the retry fails, I'll push the fix and re-r+.

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

💔 Test failed - pr-merge

@str4d
Copy link
Contributor Author

str4d commented Dec 18, 2019

Fix pushed.

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

📌 Commit f93db12 has been approved by str4d

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

⌛ Testing commit f93db12 with merge 577f7ef...

zkbot added a commit that referenced this pull request Dec 18, 2019
Bitcoin 0.12 cleanup PRs 2

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6631
- bitcoin/bitcoin#6664
  - Only the first commit (we already had the second through bitcoin/bitcoin#6825).
- bitcoin/bitcoin#6669
- bitcoin/bitcoin#6887
  - Only the non-QT parts.
- bitcoin/bitcoin#6962
- bitcoin/bitcoin#6822
  - Only first and third commits (we already had the second through an earlier PR).
- bitcoin/bitcoin#7136
  - Excludes Travis CI changes, and fixes to documents we don't have anymore.
- bitcoin/bitcoin#7084
- bitcoin/bitcoin#7509
- bitcoin/bitcoin#7617
- bitcoin/bitcoin#7726

Part of #2074.
@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 577f7ef to master...

@zkbot zkbot merged commit f93db12 into zcash:master Dec 18, 2019
@str4d str4d deleted the 2074-cleanup-2 branch December 18, 2019 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants