Details

Reviewers

deadalnix
jasonbcox
matiu

Group Reviewers

Restricted Project

Maniphest Tasks

T186: Backport Core PR10683: rpc: Move the `generate` RPC call to rpcwallet

Commits

rSTAGING2aab269666c0: [backport] rpc: Move the `generate` RPC call to rpcwallet
rABC2aab269666c0: [backport] rpc: Move the `generate` RPC call to rpcwallet

Summary

Backport Core PR10683: rpc: Move the generate RPC call to rpcwallet

2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)

This makes it possible to mine to any wallet when multi-wallet mode is added.
Solves the same problem as #10649, but IMO in a cleaner way.

It also gets rid of the circuitous ScriptForMining method on
CValidationInterface, which really doesn't belong there.

After this change it's still possible to mine without wallet through
generatetoaddress.

Closes T186

Test Plan

make check && ./test/functional/test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

rpcwallet

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 1709
Build 1709: arc lint + arc unit

Event Timeline

schancel created this revision.Jan 21 2018, 09:12

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 21 2018, 09:12

Harbormaster completed remote builds in B1697: Diff 2635.Jan 21 2018, 09:12

schancel mentioned this in D987: [backport] Multiwallet: simplest endpoint support.Jan 21 2018, 09:13

schancel added a child revision: D987: [backport] Multiwallet: simplest endpoint support.Jan 21 2018, 09:15

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging started.

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging failed.

This doesn't even build.

This revision now requires changes to proceed.Jan 21 2018, 13:28

Add config.h

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging started.

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging failed.

Add <memory> header.

Harbormaster completed remote builds in B1704: Diff 2646.Jan 21 2018, 19:25

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging started.

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging passed.

deadalnix requested changes to this revision.Jan 21 2018, 19:53

deadalnix added inline comments.

src/Makefile.am
229 ↗	(On Diff #2646)	Why ?
src/rpc/mining.h
8 ↗	(On Diff #2646)	Remove. You are only using Config by reference, you don't need it.

This revision now requires changes to proceed.Jan 21 2018, 19:53

schancel added inline comments.Jan 21 2018, 19:59

src/Makefile.am
229 ↗	(On Diff #2646)	Dependencies to RPC server stuff. The wallet library shouldn't be including RPC handlers, and they fail to compile now unless you also include rpc/mining.cpp down in the wallet.

Remove config.h

Harbormaster completed remote builds in B1709: Diff 2651.Jan 21 2018, 20:00

Add config.h back to mining.cpp

deadalnix added inline comments.Jan 21 2018, 20:09

src/Makefile.am
229 ↗	(On Diff #2646)	Looking there, it doesn't looks like it moved: https://github.com/bitcoin/bitcoin/pull/10683/files It also do not seems to make a lot of sense to include the RPC wallet in there. What happen if we build without wallet support ?