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

brunoarueira · 2017-03-03T12:32:26Z

daira

Looks good apart from the capitalization of ZEC and Zcash, and the indentation in the RPC help.

daira · 2017-03-03T17:10:03Z

src/qt/bitcoinstrings.cpp

@@ -194,7 +194,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) 2009-%i The Zcash Developers"),


Bitcoin Core copyright notices can't be deleted. In this case it wouldn't matter very much because we're about to remove the QT wallet anyway, but can you remove either this change, or all the QT changes?

daira · 2017-03-03T17:10:48Z

src/rpcblockchain.cpp

@@ -184,7 +184,7 @@ UniValue getrawmempool(const UniValue& params, bool fHelp)
            "{                           (json object)\n"
            "  \"transactionid\" : {       (json object)\n"
            "    \"size\" : n,             (numeric) transaction size in bytes\n"
-            "    \"fee\" : n,              (numeric) transaction fee in bitcoins\n"
+            "    \"fee\" : n,              (numeric) transaction fee in zec\n"


daira · 2017-03-03T17:11:19Z

src/rpcblockchain.cpp

-            "     \"reqSigs\" : n,          (numeric) Number of required signatures\n"
+            "  \"bestblock\" : \"hash\",     (string) the block hash\n"
+            "  \"confirmations\" : n,        (numeric) The number of confirmations\n"
+            "  \"value\" : x.xxx,            (numeric) The transaction value in zec\n"


ZEC (and similarly below)

daira · 2017-03-03T17:11:43Z

src/rpcblockchain.cpp

-            "     \"addresses\" : [          (array of string) array of bitcoin addresses\n"
-            "        \"bitcoinaddress\"     (string) bitcoin address\n"
+            "     \"addresses\" : [          (array of string) array of zcash addresses\n"
+            "        \"zcashaddress\"        (string) zcash address\n"


Zcash address

daira · 2017-03-03T17:11:53Z

src/rpcblockchain.cpp

            "     \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n"
-            "     \"addresses\" : [          (array of string) array of bitcoin addresses\n"
-            "        \"bitcoinaddress\"     (string) bitcoin address\n"
+            "     \"addresses\" : [          (array of string) array of zcash addresses\n"


Zcash addresses (and similarly below)

daira · 2017-03-03T17:14:32Z

src/rpcblockchain.cpp

-            "     \"asm\" : \"code\",       (string) \n"
-            "     \"hex\" : \"hex\",        (string) \n"
-            "     \"reqSigs\" : n,          (numeric) Number of required signatures\n"
+            "  \"bestblock\" : \"hash\",     (string) the block hash\n"


If a line has four escaped quotes, the description should appear two characters further to the right than if it has only two escaped quotes (i.e. the escapes are nonprinting characters).

daira · 2017-03-03T17:18:07Z

src/wallet/rpcwallet.cpp

-            + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1 \"donation\" \"seans outpost\"")
-            + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1 \"\" \"\" true")
-            + HelpExampleRpc("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\", 0.1, \"donation\", \"seans outpost\"")
+            + HelpExampleCli("sendtoaddress", "\"tb4oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\" 0.1")


This would start with t1.

zkbot · 2017-03-03T21:26:48Z

☔ The latest upstream changes (presumably #2099) made this pull request unmergeable. Please resolve the merge conflicts.

arcalinea · 2017-03-23T22:32:25Z

@daira I incorporated your comments, would love to get this merged in 1.0.8
Thanks for taking the initiative on this @brunoarueira !

arcalinea · 2017-03-23T23:00:44Z

Rebased on master

str4d

There are many good changes in here, but I'd prefer that we first pull in bitcoin/bitcoin#6504 and then rebase this on top of that. We could do both in this same PR if desired. I will review more thoroughly afterwards.

str4d · 2017-03-23T23:11:25Z

src/init.cpp

+<<<<<<< HEAD
+=======
+
+>>>>>>> Removes out bitcoin mention in favor for zcash


Shouldn't be here.

Ugh thought I got rid of this. Deleting.

Makes sense to pull in bitcoin/bitcoin#6504 first though

str4d · 2017-03-23T23:12:16Z

src/rpcmisc.cpp

@@ -61,8 +61,8 @@ UniValue getinfo(const UniValue& params, bool fHelp)
            "  \"keypoololdest\": xxxxxx,    (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
            "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
            "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
-            "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee set in btc/kb\n"
-            "  \"relayfee\": x.xxxx,         (numeric) minimum relay fee for non-free transactions in btc/kb\n"
+            "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee set in ZEC/kb\n"


These kinds of changes are better-handled IMHO by pulling in bitcoin/bitcoin#6504

arcalinea · 2017-03-24T01:47:48Z

Sounds good, we can wait on bitcoin/bitcoin#6504 then.

We should also fix #2109 by making sure the help text displays zcash addresses. I'll open a separate PR for that

Review obsoleted.

whyrusleeping · 2017-04-12T18:40:20Z

Any update here? Getting a message talking about bitcoin when i run two zcashd's in regtest on the same computer (also, side note, zcashd's regtest uses the same port as bitcoin core)

Change help text examples to use Zcash addresses Closes #1804 and #2109 Ensures command line help text addresses are Zcash addresses. Didn't change the text strings that say bitcoin or btc, leaving that for #2150 to close Did I get all the addresses?

zkbot · 2017-04-17T16:51:45Z

☔ The latest upstream changes (presumably #2205) made this pull request unmergeable. Please resolve the merge conflicts.

arcalinea · 2017-05-04T23:31:20Z

I lost track of what this was blocking on. @str4d did that PR from upstream ever get pulled in? It would be really great to get this in 1.0.9 regardless, even if it seems like a marginal improvement for now, because it's a big improvement for usability. I'm working with the RPC interface a lot and this is a constant source of annoyance and confusion, and users keep opening new issues about it as well (#2336 filed a few days ago). Can we go ahead and merge this if I rebase again?

str4d · 2017-05-04T23:37:40Z

@arcalinea No - it's a big conflicting PR, which is why I was holding off pulling it in until others of my 0.12 PRs were merged, but I can prioritise doing so if this is being targeted for 1.0.9.

nathan-at-least · 2017-05-10T19:34:52Z

Bumped from 1.0.9 due to Str4d's suggested PR dependency. Note: I didn't read the full backlog, but we're already over capacity for 1.0.9 and this is lower priority.

nathan-at-least · 2017-05-22T18:06:48Z

Bumped again. I apologize for the confusion. On Friday I was hunting for 'simple PRs' to pull into 1.0.9 to test some CI changes, and I had forgotten this was blocked on an upstream PR.

daira · 2017-08-02T05:57:28Z

See also #2548.

str4d · 2017-08-03T18:29:22Z

I have opened #2564 with the upstream PR; this PR should be rebased on master once that merges.

bitcartel · 2017-10-04T00:16:31Z

I've rebased (but can't push to the PR to update). What's the magic git/github incantation to achieve this?

str4d · 2017-10-04T00:29:31Z

@bitcartel git push -f (append your local name for the OP's remote repo if your branch isn't tracking it).

bitcartel · 2017-10-04T01:05:53Z

@str4d Thanks, the -f did the trick.

Since #2564 has closed and been merged, this PR is ready for review and merge.

Bitcoin Core => Zcash bitcoin address => Zcash address bitcoinaddress => zcashaddress Closes #1756

Upstream pulled in and rebased

bitcartel · 2017-10-05T00:09:15Z

@str4d Commits tidied up as discussed.

str4d

utACK

str4d · 2017-10-05T15:10:05Z

src/rpcblockchain.cpp

-            "     \"addresses\" : [          (array of string) array of bitcoin addresses\n"
-            "        \"bitcoinaddress\"     (string) bitcoin address\n"
+            "     \"addresses\" : [          (array of string) array of Zcash addresses\n"
+            "        \"zcashaddress\"        (string) Zcash address\n"


I'll assume that these whitespace changes actually make the output line up.

str4d · 2017-10-05T15:44:04Z

@zkbot r+

zkbot · 2017-10-05T15:44:04Z

📌 Commit 6de8501 has been approved by str4d

zkbot · 2017-10-05T15:44:09Z

⌛ Testing commit 6de8501 with merge ebe0cb3e05725fc891caa13a91147f8baa5c7a8e...

str4d · 2017-10-05T15:49:12Z

@zkbot r-

str4d · 2017-10-05T15:49:39Z

@zkbot force

str4d · 2017-10-05T15:50:18Z

@zkbot clean

str4d · 2017-10-05T15:51:39Z

@zkbot r+

zkbot · 2017-10-05T15:51:39Z

📌 Commit 6de8501 has been approved by str4d

zkbot · 2017-10-05T15:51:43Z

⌛ Testing commit 6de8501 with merge ab28fc4...

Replace "Bitcoin" with "Zcash" in strings Closes #1756

zkbot · 2017-10-05T16:59:32Z

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

brunoarueira mentioned this pull request Mar 3, 2017

Removes out btc mention in favor for zec #1766

Closed

daira self-assigned this Mar 3, 2017

daira added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2017

daira previously requested changes Mar 3, 2017

View reviewed changes

arcalinea mentioned this pull request Mar 23, 2017

Clean up "bitcoin" and "btc" in help strings #1756

Closed

arcalinea self-assigned this Mar 23, 2017

str4d previously requested changes Mar 23, 2017

View reviewed changes

arcalinea mentioned this pull request Mar 24, 2017

Change help text examples to use Zcash addresses #2205

Merged

daira added this to the 1.0.9 milestone Mar 26, 2017

bitcartel mentioned this pull request Apr 16, 2017

Change default regtest port of 18444 which is the same as (inherited from) upstream #2269

Closed

arcalinea mentioned this pull request May 4, 2017

When host datetime is not set correctly, the error message mentions Bitcoin Core rather than zcashd #2336

Closed

nathan-at-least removed this from the 1.0.9 milestone May 10, 2017

nathan-at-least modified the milestone: 1.0.9 May 19, 2017

willclarktech mentioned this pull request Jun 5, 2017

Tidy up error messages #2423

Closed

daira mentioned this pull request Aug 2, 2017

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

Merged

daira added this to Proposed in Release planning Aug 3, 2017

nathan-at-least moved this from Proposed to Misc in Release planning Aug 15, 2017

str4d moved this from Misc to 1.0.13: Cleanups in Release planning Aug 21, 2017

bitcartel added this to the 1.0.13 milestone Oct 4, 2017

brunoarueira and others added 3 commits October 4, 2017 17:05

Removes out bitcoin mention in favor for zcash

d2c1e4a

Bitcoin Core => Zcash bitcoin address => Zcash address bitcoinaddress => zcashaddress Closes #1756

s/zcash/Zcash

c165284

Replace 'bitcoin address' with 'zcash address'.

6de8501

str4d approved these changes Oct 5, 2017

View reviewed changes

str4d changed the title ~~Removes out btc mention in favor for zec~~ Replace "Bitcoin" with "Zcash" in strings Oct 5, 2017

zkbot added a commit that referenced this pull request Oct 5, 2017

Auto merge of #2150 - brunoarueira:removes_btc_mentions, r=str4d

ab28fc4

Replace "Bitcoin" with "Zcash" in strings Closes #1756

zkbot merged commit 6de8501 into zcash:master Oct 5, 2017

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

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

Conversation

brunoarueira commented Mar 3, 2017 • edited by str4d

daira left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zkbot commented Mar 3, 2017

arcalinea commented Mar 23, 2017

arcalinea commented Mar 23, 2017

str4d left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arcalinea commented Mar 24, 2017

whyrusleeping commented Apr 12, 2017

zkbot commented Apr 17, 2017

arcalinea commented May 4, 2017 • edited

str4d commented May 4, 2017

nathan-at-least commented May 10, 2017

nathan-at-least commented May 22, 2017

daira commented Aug 2, 2017

str4d commented Aug 3, 2017

bitcartel commented Oct 4, 2017

str4d commented Oct 4, 2017

bitcartel commented Oct 4, 2017

bitcartel commented Oct 5, 2017

str4d left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

str4d commented Oct 5, 2017

zkbot commented Oct 5, 2017

zkbot commented Oct 5, 2017

str4d commented Oct 5, 2017

str4d commented Oct 5, 2017

str4d commented Oct 5, 2017

str4d commented Oct 5, 2017

zkbot commented Oct 5, 2017

zkbot commented Oct 5, 2017

zkbot commented Oct 5, 2017

brunoarueira commented Mar 3, 2017 •

edited by str4d

arcalinea commented May 4, 2017 •

edited