diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-08-14 12:04:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-08-14 16:28:37 +0200 |
| commit | ddd8d80c63182aefea56abf743bb9199d9602544 (patch) | |
| tree | 4cb40e3bc509c433388bf8c58dee9e3f6b86c046 /src/rpcclient.cpp | |
| parent | Merge pull request #6519 (diff) | |
| parent | SQUASH "Implement watchonly support in fundrawtransaction" (diff) | |
| download | discoin-ddd8d80c63182aefea56abf743bb9199d9602544.tar.xz discoin-ddd8d80c63182aefea56abf743bb9199d9602544.zip | |
Merge pull request #6415
d042854 SQUASH "Implement watchonly support in fundrawtransaction" (Matt Corallo)
428a898 SQUASH "Add have-pubkey distinction to ISMINE flags" (Matt Corallo)
6bdb474 Implement watchonly support in fundrawtransaction (Matt Corallo)
f5813bd Add logic to track pubkeys as watch-only, not just scripts (Matt Corallo)
d3354c5 Add have-pubkey distinction to ISMINE flags (Matt Corallo)
5c17059 Update importaddress help to push its use to script-only (Matt Corallo)
a1d7df3 Add importpubkey method to import a watch-only pubkey (Matt Corallo)
907a425 Add p2sh option to importaddress to import redeemScripts (Matt Corallo)
983d2d9 Split up importaddress into helper functions (Matt Corallo)
cfc3dd3 Also remove pay-2-pubkey from watch when adding a priv key (Matt Corallo)
Diffstat (limited to 'src/rpcclient.cpp')
| -rw-r--r-- | src/rpcclient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index b41e960e8..0c8e6d6d6 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -87,6 +87,8 @@ static const CRPCConvertParam vRPCConvertParams[] = { "lockunspent", 1 }, { "importprivkey", 2 }, { "importaddress", 2 }, + { "importaddress", 3 }, + { "importpubkey", 2 }, { "verifychain", 0 }, { "verifychain", 1 }, { "keypoolrefill", 0 }, |