Switch miner to P2PKH, add -mineraddress option #1965

str4d · 2016-12-23T04:32:58Z

Closes #945 and #1955.

str4d · 2016-12-23T04:34:13Z

This PR is branched from #1863; merge that first.

str4d · 2017-01-04T09:10:26Z

src/miner.cpp


-    CScript scriptPubKey = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
+    CScript scriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;


Reviewers, please double-check that I have this P2PKH script correct.

It's correct.

bitcartel

There is no error if the mineraddress is invalid, whether empty whitespace, garbage or an address with a typo.

Instead, mining proceeds successfully with the coinbase reward going to address tm9iMLAuYMzJ6jtFLcA7rzUmfreGuKvr7Ma.

This is the address when keyID is null.

./zcash-cli validateaddress tm9iMLAuYMzJ6jtFLcA7rzUmfreGuKvr7Ma
{
"isvalid" : true,
"address" : "tm9iMLAuYMzJ6jtFLcA7rzUmfreGuKvr7Ma",
"scriptPubKey" : "76a914000000000000000000000000000000000000000088ac",
"ismine" : false
}

The above should be fixed and automated tests written to check input validity and spending the coinbase.

Also consider adding an option -mineraddressismine (default true) where the user must explicitly set this to false to allow mining to an address not in the wallet.

Reporting problems with the miner address, whether invalid or not mine, should be at launch so that the user is notified immediately.

bitcartel · 2017-01-26T19:39:12Z

@str4d Getting compile errors:

libbitcoin_server.a(libbitcoin_server_a-rpcmining.o): In function `getblocktemplate(std::vector<json_spirit::Value_impl<json_spirit::Config_vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::allocator<json_spirit::Value_impl<json_spirit::Config_vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > > const&, bool)':
/home/xxxxxxxxx/projects/zcash/src/rpcmining.cpp:621: undefined reference to `CreateNewBlockWithKey(CReserveKey&)'
collect2: error: ld returned 1 exit status
Makefile:3186: recipe for target 'zcashd' failed

str4d · 2017-01-27T11:26:47Z

@bitcartel Strange, I don't get those errors...

Re: the current merge conflict, I'll rebase this on master once #1863 is merged.

str4d · 2017-01-29T12:36:51Z

Ah, the error @bitcartel has shows up with --disable-mining. Fixing.

str4d · 2017-01-29T13:21:32Z

@bitcartel I like your idea of a -minetolocalwallet flag (I'm using that because -mineraddressismine is a bit hard to read), but should the default be false when the zcashd is compiled without a wallet?

str4d · 2017-01-30T21:27:37Z

Rebased on #1863 again (which fixed the merge conflict, since #1863 has been rebased on 1.0.5), and fixed some things.

bitcartel · 2017-02-04T02:13:19Z

@str4d

-minetolocalwallet flag... should the default be false when the zcashd is compiled without a wallet?

Sounds good. If zcashd doesn't have a wallet, then the flag should be disregarded.

bitcartel · 2017-02-05T19:21:45Z

@str4d compile error

rpcmining.cpp: In function ‘json_spirit::Value generate(const Array&, bool)’:
rpcmining.cpp:271:1: error: a function-definition is not allowed here before ‘{’ token
 {
 ^
rpcmining.cpp:905:1: error: expected ‘}’ at end of input
 }
 ^
Makefile:4250: recipe for target 'libbitcoin_server_a-rpcmining.o' failed
make[2]: *** [libbitcoin_server_a-rpcmining.o] Error 1

Closes zcash#945 and zcash#1955.

str4d · 2017-02-08T23:36:57Z

@bitcartel whoops, I changed the help text but not the error messages. Fixing...

bitcartel · 2017-02-09T00:01:58Z

ACK

daira

utACK, but I'm going to smoke-test it with all four combinations of {ENABLE_WALLET, ENABLE_MINER} as well, because there's a lot of conditional code here.

daira · 2017-02-09T17:53:58Z

If I disable the wallet (by editing build.sh to pass --enable-wallet=no to configure) but do not disable the miner and do not use -mineraddress, I expect to get a failure on startup. However, I actually still see "You are mining with the tromp solver on 4 threads." on the metrics screen, even though no mining takes place.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

daira · 2017-02-09T19:36:06Z

ACK everything except my last patch.

bitcartel · 2017-02-09T20:49:16Z

ACK

bitcartel · 2017-02-09T20:49:23Z

@zkbot r+

zkbot · 2017-02-09T20:49:24Z

📌 Commit 9bba9b3 has been approved by bitcartel

Switch miner to P2PKH, add -mineraddress option Closes #945 and #1955.

zkbot · 2017-02-09T20:55:34Z

⌛ Testing commit 9bba9b3 with merge 0c78782...

str4d

@daira @bitcartel I'm not going to stop this merging, but see my comment.

str4d · 2017-02-09T21:17:57Z

src/init.cpp

+        return InitError(_("Zcash was not built with wallet support. Set -minetolocalwallet=0 to use -mineraddress, or rebuild Zcash with wallet support."));
+    }
+    if (!mapArgs.count("-mineraddress")) {
+        return InitError(_("Zcash was not built with wallet support. Set -mineraddress, or rebuild Zcash with wallet support."));


As-is, this will require a build with !ENABLE_WALLET && ENABLE_MINING to always have -mineraddress set, even if -gen is not set. Is this what we want? It does make some sense, because zcash-cli setgenerate wouldn't work properly if -mineraddress wasn't set, and the user likely does want to mine in this setup, but I'm not sure we should assume that.

Ideally this would be allowed when -gen is not set, but setgenerate would fail.

Fixed in #2081

zkbot · 2017-02-09T21:38:48Z

☀️ Test successful - zcash

@str4d

Address @str4d's comment on #1965 about the case where -gen is not set #1965 (comment) Note that the case of calling the ``setgenerate true`` RPC with the wallet disabled was already handled correctly. Signed-off-by: Daira Hopwood <daira@jacaranda.org>

str4d added A-pow Area: Proof-of-Work and mining S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 23, 2016

str4d added this to the 1.0.5 milestone Dec 23, 2016

str4d mentioned this pull request Jan 4, 2017

Pause mining during JoinSplit creation #1932

Merged

str4d commented Jan 4, 2017

View reviewed changes

bitcartel assigned str4d Jan 16, 2017

bitcartel requested review from bitcartel, daira and ebfull January 16, 2017 22:07

ebfull self-assigned this Jan 18, 2017

bitcartel suggested changes Jan 18, 2017

View reviewed changes

ebfull modified the milestones: 1.0.5, 1.0.6 Jan 19, 2017

str4d force-pushed the 1955-single-address-mining branch from b6eb162 to aa0081f Compare January 26, 2017 16:03

str4d force-pushed the 1955-single-address-mining branch from aa0081f to a4c34ea Compare January 27, 2017 11:24

str4d force-pushed the 1955-single-address-mining branch from a4c34ea to c3d2145 Compare January 29, 2017 12:53

Add compile flag to disable compilation of mining code

2cc0a25

str4d force-pushed the 1955-single-address-mining branch 2 times, most recently from ecdad51 to ae8dae9 Compare January 30, 2017 21:19

Switch miner to P2PKH, add -mineraddress option

8e8b6d7

Closes zcash#945 and zcash#1955.

Add -minetolocalwallet flag, enforced on -mineraddress

f49bcdf

str4d force-pushed the 1955-single-address-mining branch from a7d6500 to f49bcdf Compare February 8, 2017 23:38

bitcartel approved these changes Feb 9, 2017

View reviewed changes

daira reviewed Feb 9, 2017

View reviewed changes

daira mentioned this pull request Feb 9, 2017

Add compile flag to disable compilation of mining code #1863

Merged

Better error reporting for the !ENABLE_WALLET && ENABLE_MINING case.

9bba9b3

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

zkbot added a commit that referenced this pull request Feb 9, 2017

Auto merge of #1965 - str4d:1955-single-address-mining, r=bitcartel

0c78782

Switch miner to P2PKH, add -mineraddress option Closes #945 and #1955.

str4d mentioned this pull request Feb 9, 2017

Convert entire source tree from json_spirit to UniValue #1990

Merged

str4d commented Feb 9, 2017

View reviewed changes

zkbot merged commit 9bba9b3 into zcash:master Feb 9, 2017

This was referenced Feb 9, 2017

Add a flag for enabling experimental features #2056

Merged

Manually backport upstream's NODE_BLOOM bit #1574

Closed

daira mentioned this pull request Feb 10, 2017

Address @str4d's comment on #1965 about the case where -gen is not set #2081

Merged

str4d deleted the 1955-single-address-mining branch February 10, 2017 01:08

str4d added A-block-creation Area: Block creation and submission by miners and removed A-pow Area: Proof-of-Work and mining labels Jan 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch miner to P2PKH, add -mineraddress option #1965

Switch miner to P2PKH, add -mineraddress option #1965

str4d commented Dec 23, 2016

str4d commented Dec 23, 2016

str4d Jan 4, 2017

bitcartel Jan 18, 2017

bitcartel left a comment •

edited

bitcartel commented Jan 26, 2017

str4d commented Jan 27, 2017

str4d commented Jan 29, 2017

str4d commented Jan 29, 2017

str4d commented Jan 30, 2017

bitcartel commented Feb 4, 2017

bitcartel commented Feb 5, 2017

str4d commented Feb 8, 2017

bitcartel commented Feb 9, 2017

daira left a comment

daira commented Feb 9, 2017 •

edited

daira commented Feb 9, 2017 •

edited

bitcartel commented Feb 9, 2017

bitcartel commented Feb 9, 2017

zkbot commented Feb 9, 2017

zkbot commented Feb 9, 2017

str4d left a comment

str4d Feb 9, 2017

daira Feb 9, 2017

daira Feb 10, 2017

zkbot commented Feb 9, 2017


		CScript scriptPubKey = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
		CScript scriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;

Switch miner to P2PKH, add -mineraddress option #1965

Switch miner to P2PKH, add -mineraddress option #1965

Conversation

str4d commented Dec 23, 2016

str4d commented Dec 23, 2016

str4d Jan 4, 2017

Choose a reason for hiding this comment

bitcartel Jan 18, 2017

Choose a reason for hiding this comment

bitcartel left a comment • edited

Choose a reason for hiding this comment

bitcartel commented Jan 26, 2017

str4d commented Jan 27, 2017

str4d commented Jan 29, 2017

str4d commented Jan 29, 2017

str4d commented Jan 30, 2017

bitcartel commented Feb 4, 2017

bitcartel commented Feb 5, 2017

str4d commented Feb 8, 2017

bitcartel commented Feb 9, 2017

daira left a comment

Choose a reason for hiding this comment

daira commented Feb 9, 2017 • edited

daira commented Feb 9, 2017 • edited

bitcartel commented Feb 9, 2017

bitcartel commented Feb 9, 2017

zkbot commented Feb 9, 2017

zkbot commented Feb 9, 2017

str4d left a comment

Choose a reason for hiding this comment

str4d Feb 9, 2017

Choose a reason for hiding this comment

daira Feb 9, 2017

Choose a reason for hiding this comment

daira Feb 10, 2017

Choose a reason for hiding this comment

zkbot commented Feb 9, 2017

bitcartel left a comment •

edited

daira commented Feb 9, 2017 •

edited

daira commented Feb 9, 2017 •

edited