Rationalize currency unit to "BTC" #6504

rnicoll · 2015-08-01T19:39:56Z

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.

theochino · 2015-08-01T20:06:31Z

Hello,

I would suggest using XBT instead of the BTx is the ISO prefix for Bhutan.

Regard,
Theo Chino, NYC
(Participant of the foundation now defunct group for the ISO certification
for Bitcoin)

On Saturday, August 1, 2015, Ross Nicoll notifications@github.com wrote:

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.

You can view, comment on, or merge this pull request online at:

#6504
Commit Summary

Rationalize currency unit to "BTC"

File Changes

M src/amount.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-0 (4)

M src/amount.h
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-1 (2)

M src/init.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-2 (13)

M src/rpcblockchain.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-3 (5)

M src/rpcmisc.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-4 (4)

M src/rpcnet.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-5 (2)

M src/rpcrawtransaction.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-6 (6)

M src/wallet/rpcwallet.cpp
https://github.com/bitcoin/bitcoin/pull/6504/files#diff-7 (45)

Patch Links:

https://github.com/bitcoin/bitcoin/pull/6504.patch

https://github.com/bitcoin/bitcoin/pull/6504.diff

—
Reply to this email directly or view it on GitHub
#6504.

rnicoll · 2015-08-01T20:15:28Z

I'll leave others to discuss whether it should change, but this patch certainly makes it simpler by using a single constant (although QT wallet values would need to be updated independently)

luke-jr · 2015-08-01T22:18:50Z

src/init.cpp

@@ -342,16 +342,17 @@ std::string HelpMessage(HelpMessageMode mode)
    strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls"));
    strUsage += HelpMessageOpt("-keypool=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), 100));
    if (showDebug)
-        strUsage += HelpMessageOpt("-mintxfee=<amt>", strprintf("Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)",


At least fix Kb to kb here at the same time..

luke-jr · 2015-08-01T22:19:38Z

@theochino XBT is not a well-defined denomination. Different parts of the community use it for different size bases.

luke-jr · 2015-08-01T22:20:53Z

Also, as to the concept of this PR itself: I don't think we need to define a variable for every reused term. Just changing "btc" and "bitcoins" to "BTC" in literals should be sufficient.

rnicoll · 2015-08-02T09:23:00Z

Fixed kilobyte units, and removed the constant string.

rnicoll · 2015-08-02T11:54:04Z

Just realised these strings are all copied into qt/bitcoinstrings.cpp - are those extracted automatically and I shouldn't touch them, or do they need updating too?

laanwj · 2015-08-03T08:17:09Z

Concept ACK on moving the currency unit to a constant.
Please do leave it as BTC. Changing it to XBT becomes trivial for those that insist on it, if it's managed from one plcae.

Just realised these strings are all copied into qt/bitcoinstrings.cpp - are those extracted automatically and I shouldn't touch them, or do they need updating too?

Don't touch the file manually. Translation strings are extracted automatically by make translate's tooling. This updates bitcoinstrings as well as the English ts_file.

Diapolo · 2015-08-03T14:11:26Z

This only seems to cover core code, any reason not to do this for the GUI part?

rnicoll · 2015-08-03T18:12:46Z

@Diapolo Couldn't see any problems in the QT code, apart from the bitcoinstrings.cpp (which are generated), and that code uses its own copy of currency units generally. Do let me know if I've missed anything.

laanwj · 2015-08-03T18:46:21Z

Hm, you removed the parametrization?

rnicoll · 2015-08-03T18:56:06Z

Putting it back at the moment

rnicoll · 2015-08-03T19:14:45Z

Done - let me know if that's okay and I'll squash them

luke-jr · 2015-08-03T19:30:55Z

src/qt/bitcoinunits.cpp

-    case mBTC: return QString("mBTC");
-    case uBTC: return QString::fromUtf8("μBTC");
+    case BTC: return QString(CURRENCY_UNIT.c_str());
+    case mBTC: return QString(("m" + CURRENCY_UNIT).c_str());


Did you test this? const char * + const char * is going to be a pointer to some undefined memory...

It's std::string + std::string I believe, and certainly seemed to work. Removing as per @laanwj 's request anyway.

No longer relevant here, but for next time: you can use QString::fromStdString to convert a std::string to QString. No need for c_str.

rnicoll · 2015-08-03T20:22:53Z

Fixed, and found a couple of uses of "bitcoin" as a unit too, which I've also fixed.

Thanks for the tip re: QString

laanwj · 2015-08-03T20:58:25Z

src/rpcmining.cpp

@@ -264,7 +264,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
 }


-// NOTE: Unlike wallet RPC (which use BTC values), mining RPCs follow GBT (BIP 22) in using satoshi amounts
+// NOTE: Unlike wallet RPC (which use " + CURRENCY_UNIT + " values), mining RPCs follow GBT (BIP 22) in using satoshi amounts


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.

laanwj · 2015-08-03T21:58:45Z

Tested ACK (but please remove the runaway unit parametrization from the comment)

rnicoll · 2015-08-03T22:16:23Z

Fixed and squashed

9ca7857 Rationalize currency unit to "BTC" (Ross Nicoll)

theochino · 2015-09-25T18:52:14Z

@luke-jr (On your August 1st comment.) - In 3 letters ISO codes, BTC will never be accepted (even it is used today) by the power to be.

I do prefer the BTC version until I read everything there was on ISO4217 and participated in the foundation working group - https://en.wikipedia.org/wiki/ISO_4217

Once I read it, X (Supranational) BT (Bitcoin) makes more scene than BTC which belong to Bhutan.
I say let make it XBT and make it easy for everyone we want to use the Bitcoin.

Just saying. XBT is free in the ISO code nomenclature. Why not claim it.
People are confused enough as it is ....

luke-jr · 2015-09-25T20:37:51Z

"XBT" is fine as a symbol. My point is that it is not well-defined whether it represents 100,000,000 (BTC), 100,000 (mBTC), 100 (µBTC), or whatever else.

theochino · 2015-09-25T20:57:51Z

I see your point ... leave it as BTC now and wait ... maybe later 1 XBT = 1 µBTC.
The problem, until we solve all the socials ills of the planet, is that will never be a one size fits all solution. Those with wealth will say 1 XBT = 100 BTC, and those on the other side will say 1 XBT = 1 mBTC.

To avoid headaches, I use 1 BTC = 1 XBT, 100'000 mBTC = 100'000 mXBT, and 100 µBTC = 100 µXBT and leave the fixing of the social ill to the pope. ISO standard has a field for the decimal (and I believe it does go to 8) so it would be a "trivial" change to use 1 BTC = 1 XBT which makes it simpler in the code to replace.

If the amount changes in the future, we'll change it to something else when we cross that bridge. Anyway, it was a small "loaded" request ....

sipa · 2015-09-25T21:03:55Z

Unifying the currency names across the source code to a single constant is useful on itself, regardless of what people think that constant should be.

Revert before merging bitcoin/bitcoin#6504.

Rationalize currency unit to "ZEC" Cherry-picked from the upstream PR bitcoin/bitcoin#6504 Part of #2074

luke-jr reviewed Aug 1, 2015
View reviewed changes

rnicoll force-pushed the normalize-units branch from 253cc3f to 520f8f5 Compare August 2, 2015 09:20

laanwj added the Refactoring label Aug 3, 2015

luke-jr reviewed Aug 3, 2015
View reviewed changes

rnicoll force-pushed the normalize-units branch from b4a7b78 to 2c9c69a Compare August 3, 2015 20:17

laanwj reviewed Aug 3, 2015
View reviewed changes

rnicoll force-pushed the normalize-units branch from 2c9c69a to 9ca7857 Compare August 3, 2015 22:14

laanwj merged commit 9ca7857 into bitcoin:master Aug 3, 2015

laanwj added a commit that referenced this pull request Aug 3, 2015

Merge pull request #6504

b6fee6b

9ca7857 Rationalize currency unit to "BTC" (Ross Nicoll)

This was referenced Aug 6, 2015

[REST] Add memory pool API #6013

Merged

Add OP_RETURN support in createrawtransaction RPC call, add tests. #6346

Merged

str4d mentioned this pull request Feb 28, 2017

Bitcoin 0.12 RPC PRs 1 zcash/zcash#2100

Merged

str4d added a commit to str4d/zcash that referenced this pull request Mar 2, 2017

BTC -> ZEC in paytxfee RPC docs

3c01439

Revert before merging bitcoin/bitcoin#6504.

str4d mentioned this pull request Mar 23, 2017

Replace "Bitcoin" with "Zcash" in strings zcash/zcash#2150

Merged

This was referenced Aug 3, 2017

Rationalize currency unit to "ZEC" zcash/zcash#2564

Merged

Replace "Bitcoin" with "Zcash" in thread names and error messages zcash/zcash#2548

Merged

zkbot added a commit to zcash/zcash that referenced this pull request Sep 18, 2017

Auto merge of #2564 - str4d:2074-currency-units, r=str4d

e0bef1d

Rationalize currency unit to "ZEC" Cherry-picked from the upstream PR bitcoin/bitcoin#6504 Part of #2074

rnicoll deleted the normalize-units branch March 13, 2018 08:44

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rationalize currency unit to "BTC" #6504

Rationalize currency unit to "BTC" #6504

rnicoll commented Aug 1, 2015

theochino commented Aug 1, 2015

"amount" field description to the (deprecated) move RPC command.

rnicoll commented Aug 1, 2015

luke-jr Aug 1, 2015

luke-jr commented Aug 1, 2015

luke-jr commented Aug 1, 2015

rnicoll commented Aug 2, 2015

rnicoll commented Aug 2, 2015

laanwj commented Aug 3, 2015

Diapolo commented Aug 3, 2015

rnicoll commented Aug 3, 2015

laanwj commented Aug 3, 2015

rnicoll commented Aug 3, 2015

rnicoll commented Aug 3, 2015

luke-jr Aug 3, 2015

rnicoll Aug 3, 2015

laanwj Aug 3, 2015

rnicoll commented Aug 3, 2015

laanwj Aug 3, 2015

laanwj commented Aug 3, 2015

rnicoll commented Aug 3, 2015

theochino commented Sep 25, 2015

luke-jr commented Sep 25, 2015

theochino commented Sep 25, 2015

sipa commented Sep 25, 2015 via email

Rationalize currency unit to "BTC" #6504

Rationalize currency unit to "BTC" #6504

Conversation

rnicoll commented Aug 1, 2015

theochino commented Aug 1, 2015

"amount" field description to the (deprecated) move RPC command.

rnicoll commented Aug 1, 2015

luke-jr Aug 1, 2015

Choose a reason for hiding this comment

luke-jr commented Aug 1, 2015

luke-jr commented Aug 1, 2015

rnicoll commented Aug 2, 2015

rnicoll commented Aug 2, 2015

laanwj commented Aug 3, 2015

Diapolo commented Aug 3, 2015

rnicoll commented Aug 3, 2015

laanwj commented Aug 3, 2015

rnicoll commented Aug 3, 2015

rnicoll commented Aug 3, 2015

luke-jr Aug 3, 2015

Choose a reason for hiding this comment

rnicoll Aug 3, 2015

Choose a reason for hiding this comment

laanwj Aug 3, 2015

Choose a reason for hiding this comment

rnicoll commented Aug 3, 2015

laanwj Aug 3, 2015

Choose a reason for hiding this comment

laanwj commented Aug 3, 2015

rnicoll commented Aug 3, 2015

theochino commented Sep 25, 2015

luke-jr commented Sep 25, 2015

theochino commented Sep 25, 2015

sipa commented Sep 25, 2015 via email