Skip to content

Conversation

@str4d
Copy link
Contributor

@str4d str4d commented Aug 3, 2017

Cherry-picked from the upstream PR bitcoin/bitcoin#6504

Part of #2074

Ross Nicoll and others added 2 commits August 3, 2017 16:32
Previously various user-facing strings have used inconsistent currency units "BTC",
"btc" and "bitcoins". This adds a single constant and uses it for each reference to
the currency unit.

Also adds a description of the unit for --maxtxfee, and adds the missing "amount"
field description to the (deprecated) move RPC command.
@str4d str4d added 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. labels Aug 3, 2017
@str4d str4d self-assigned this Aug 15, 2017
@str4d str4d added this to the 1.0.12 milestone Aug 22, 2017
@str4d str4d requested review from arcalinea and bitcartel September 4, 2017 14:59

extern const std::string CURRENCY_UNIT;

/** No amount larger than this (in satoshi) is valid.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/satoshi/zatoshi?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are other PRs that handle these changes. This PR solely focuses on the currency unit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok


/** No amount larger than this (in satoshi) is valid.
*
* Note that this constant is *not* the total money supply, which in Bitcoin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/Bitcoin/Zcash

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above.

@arcalinea
Copy link
Contributor

ACK, let's try to get the other PR's changing the names in there too though. At least before 1 yr is up :)

@str4d str4d mentioned this pull request Sep 18, 2017
@str4d
Copy link
Contributor Author

str4d commented Sep 18, 2017

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Sep 18, 2017

📌 Commit 6dec2d0 has been approved by str4d

zkbot added a commit that referenced this pull request Sep 18, 2017
Rationalize currency unit to "ZEC"

Cherry-picked from the upstream PR bitcoin/bitcoin#6504

Part of #2074
@zkbot
Copy link
Contributor

zkbot commented Sep 18, 2017

⌛ Testing commit 6dec2d0 with merge e0bef1d...

@zkbot
Copy link
Contributor

zkbot commented Sep 18, 2017

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

@zkbot zkbot merged commit 6dec2d0 into zcash:master Sep 18, 2017
@str4d str4d deleted the 2074-currency-units branch January 27, 2023 17:02
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.

4 participants