diff --git a/_autocrossref.yaml b/_autocrossref.yaml
index bdf99d7a2a..3f7d82536d 100644
--- a/_autocrossref.yaml
+++ b/_autocrossref.yaml
@@ -183,6 +183,8 @@ CVE-2012-2459:
'`addmultisigaddress` RPC': rpc addmultisigaddress
'`addnode`': rpc addnode
'`addnode` RPC': rpc addnode
+'`addwitnessaddress`': rpc addwitnessaddress
+'`addwitnessaddress` RPC': rpc addwitnessaddress
'`backupwallet`': rpc backupwallet
'`backupwallet` RPC': rpc backupwallet
'`clearbanned`': rpc clearbanned
@@ -207,8 +209,12 @@ CVE-2012-2459:
'`estimatefee` RPC': rpc estimatefee
'`estimatepriority`': rpc estimatepriority
'`estimatepriority` RPC': rpc estimatepriority
+'`fundrawtransaction`': rpc fundrawtransaction
+'`fundrawtransaction` RPC': rpc fundrawtransaction
'`generate`': rpc generate
'`generate` RPC': rpc generate
+'`generatetoaddress`': rpc generatetoaddress
+'`generatetoaddress` RPC': rpc generatetoaddress
'`getaccount`': rpc getaccount
'`getaccount` RPC': rpc getaccount
'`getaccountaddress`': rpc getaccountaddress
@@ -245,6 +251,12 @@ CVE-2012-2459:
'`gethashespersec` RPC': rpc gethashespersec
'`getinfo`': rpc getinfo
'`getinfo` RPC': rpc getinfo
+'`getmempoolancestors`': rpc getmempoolancestors
+'`getmempoolancestors` RPC': rpc getmempoolancestors
+'`getmempooldescendants`': rpc getmempooldescendants
+'`getmempooldescendants` RPC': rpc getmempooldescendants
+'`getmempoolentry`': rpc getmempoolentry
+'`getmempoolentry` RPC': rpc getmempoolentry
'`getmempoolinfo`': rpc getmempoolinfo
'`getmempoolinfo` RPC': rpc getmempoolinfo
'`getmininginfo`': rpc getmininginfo
@@ -289,6 +301,8 @@ CVE-2012-2459:
'`importaddress` RPC': rpc importaddress
'`importprivkey`': rpc importprivkey
'`importprivkey` RPC': rpc importprivkey
+'`importprunedfunds`': rpc importprunedfunds
+'`importprunedfunds` RPC': rpc importprunedfunds
'`importwallet`': rpc importwallet
'`importwallet` RPC': rpc importwallet
'`keypoolrefill`': rpc keypoolrefill
@@ -317,6 +331,8 @@ CVE-2012-2459:
'`move` RPC': rpc move
'`ping`': rpc ping
'`ping` RPC': rpc ping
+'`removeprunedfunds`': rpc removeprunedfunds
+'`removeprunedfunds` RPC': rpc removeprunedfunds
'`sendfrom`': rpc sendfrom
'`sendfrom` RPC': rpc sendfrom
'`sendheaders`': sendheaders message
@@ -338,6 +354,8 @@ CVE-2012-2459:
'`settxfee` RPC': rpc settxfee
'`signmessage`': rpc signmessage
'`signmessage` RPC': rpc signmessage
+'`signmessagewithprivkey`': rpc signmessagewithprivkey
+'`signmessagewithprivkey` RPC': rpc signmessagewithprivkey
'`signrawtransaction`': rpc signrawtransaction
'`signrawtransaction` RPC': rpc signrawtransaction
'`stop`': rpc stop
diff --git a/_config.yml b/_config.yml
index ea87e555ca..a810aac429 100644
--- a/_config.yml
+++ b/_config.yml
@@ -250,6 +250,7 @@ devsearches:
- 'AbandonTransaction': "/en/developer-reference#abandontransaction"
- 'AddMultiSigAddress': "/en/developer-reference#addmultisigaddress"
- 'AddNode': "/en/developer-reference#addnode"
+ - 'AddWitnessAddress': "/en/developer-reference#addwitnessaddress"
- 'BackupWallet': "/en/developer-reference#backupwallet"
- 'ClearBanned': "/en/developer-reference#clearbanned"
- 'CreateMultisig': "/en/developer-reference#createmultisig"
@@ -262,6 +263,9 @@ devsearches:
- 'EncryptWallet': "/en/developer-reference#encryptwallet"
- 'EstimateFee': "/en/developer-reference#estimatefee"
- 'EstimatePriority': "/en/developer-reference#estimatepriority"
+ - 'FundRawTransaction': "/en/developer-reference#fundrawtransaction"
+ - 'Generate': "/en/developer-reference#generate"
+ - 'GenerateToAddress': "/en/developer-reference#generatetoaddress"
- 'GetAccount': "/en/developer-reference#getaccount"
- 'GetAccountAddress': "/en/developer-reference#getaccountaddress"
- 'GetAddedNodeInfo': "/en/developer-reference#getaddednodeinfo"
@@ -281,6 +285,9 @@ devsearches:
- 'GetHashesPerSec': "/en/developer-reference#gethashespersec"
- 'GetInfo': "/en/developer-reference#getinfo"
- 'GetMempoolInfo': "/en/developer-reference#getmempoolinfo"
+ - 'GetMempoolEntry': "/en/developer-reference#getmempoolentry"
+ - 'GetMempoolAncestors': "/en/developer-reference#getmempoolancestors"
+ - 'GetMempoolDescendants': "/en/developer-reference#getmempooldescendants"
- 'GetMiningInfo': "/en/developer-reference#getmininginfo"
- 'GetNetTotals': "/en/developer-reference#getnettotals"
- 'GetNetworkHashPS': "/en/developer-reference#getnetworkhashps"
@@ -302,6 +309,7 @@ devsearches:
- 'Help': "/en/developer-reference#help"
- 'ImportAddress': "/en/developer-reference#importaddress"
- 'ImportPrivkey': "/en/developer-reference#importprivkey"
+ - 'ImportPrunedFunds': "/en/developer-reference#importprunedfunds"
- 'ImportWallet': "/en/developer-reference#importwallet"
- 'KeypoolRefill': "/en/developer-reference#keypoolrefill"
- 'ListAccounts': "/en/developer-reference#listaccounts"
@@ -316,6 +324,7 @@ devsearches:
- 'LockUnspent': "/en/developer-reference#lockunspent"
- 'Move': "/en/developer-reference#move"
- 'Ping': "/en/developer-reference#ping-rpc"
+ - 'RemovePrunedFunds': "/en/developer-reference#removeprunedfunds"
- 'SendFrom': "/en/developer-reference#sendfrom"
- 'SendMany': "/en/developer-reference#sendmany"
- 'SendRawTransaction': "/en/developer-reference#sendrawtransaction"
@@ -325,6 +334,7 @@ devsearches:
- 'SetGenerate': "/en/developer-reference#setgenerate"
- 'SetTxFee': "/en/developer-reference#settxfee"
- 'SignMessage': "/en/developer-reference#signmessage"
+ - 'SignMessageWithPrivKey': "/en/developer-reference#signmessagewithprivkey"
- 'SignRawTransaction': "/en/developer-reference#signrawtransaction"
- 'Stop': "/en/developer-reference#stop"
- 'SubmitBlock': "/en/developer-reference#submitblock"
diff --git a/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md b/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md
index b3a116fe36..c81f3d96c5 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md
@@ -21,6 +21,13 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
{% assign UPDATED_MASTER='**Updated in master**' %}
{% assign DEPRECATED='**Deprecated**' %}
+
+{% assign UPDATED0_13_1='*Updated in 0.13.1*' %}
+
+
+{% assign NEW0_13_0='*New in 0.13.0*' %}
+{% assign UPDATED0_13_0='*Updated in 0.13.0*' %}
+
{% assign UPDATED0_12_1='*Updated in 0.12.1*' %}
@@ -56,8 +63,11 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
* [GetBlockHeader][rpc getblockheader]: {{summary_getBlockHeader}} {{NEW0_12_0}}
* [GetChainTips][rpc getchaintips]: {{summary_getChainTips}} {{NEW0_10_0}}
* [GetDifficulty][rpc getdifficulty]: {{summary_getDifficultly}}
+* [GetMemPoolAncestors][rpc getmempoolancestors]: {{summary_getMemPoolAncestors}} {{NEW0_13_0}}
+* [GetMemPoolDescendants][rpc getmempooldescendants]: {{summary_getMemPoolDescendants}} {{NEW0_13_0}}
+* [GetMemPoolEntry][rpc getmempoolentry]: {{summary_getMemPoolEntry}} {{NEW0_13_0}}
* [GetMemPoolInfo][rpc getmempoolinfo]: {{summary_getMemPoolInfo}} {{NEW0_10_0}}, {{UPDATED0_12_0}}
-* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}}
+* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}} {{UPDATED0_13_0}}
* [GetTxOut][rpc gettxout]: {{summary_getTxOut}}
* [GetTxOutProof][rpc gettxoutproof]: {{summary_getTxOutProof}} {{NEW0_11_0}}
* [GetTxOutSetInfo][rpc gettxoutsetinfo]: {{summary_getTxOutSetInfo}}
@@ -84,9 +94,8 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
{% autocrossref %}
-* [Generate][rpc generate]: {{summary_generate}} {{NEW_MASTER}}
-* [GetGenerate][rpc getgenerate]: {{summary_getGenerate}}
-* [SetGenerate][rpc setgenerate]: {{summary_setGenerate}} {{UPDATED_MASTER}}
+* [Generate][rpc generate]: {{summary_generate}} {{NEW0_11_0}}, {{UPDATED0_13_0}}
+* [GenerateToAddress][rpc generatetoaddress]: {{summary_generateToAddress}} {{NEW0_13_0}}
{% endautocrossref %}
@@ -97,7 +106,7 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
{% autocrossref %}
* [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}}
-* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}} {{UPDATED_MASTER}}
+* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}} {{UPDATED0_13_0}}
* [GetNetworkHashPS][rpc getnetworkhashps]: {{summary_getNetworkHashPS}}
* [PrioritiseTransaction][rpc prioritisetransaction]: {{summary_prioritiseTransaction}} {{NEW0_10_0}}
* [SubmitBlock][rpc submitblock]: {{summary_submitBlock}}
@@ -115,9 +124,9 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
* [DisconnectNode][rpc disconnectnode]: {{summary_disconnectNode}} {{NEW0_12_0}}
* [GetAddedNodeInfo][rpc getaddednodeinfo]: {{summary_getAddedNodeInfo}}
* [GetConnectionCount][rpc getconnectioncount]: {{summary_getConnectionCount}}
-* [GetNetTotals][rpc getnettotals]: {{summary_getNetTotals}}
-* [GetNetworkInfo][rpc getnetworkinfo]: {{summary_getNetworkInfo}} {{UPDATED0_10_0}}
-* [GetPeerInfo][rpc getpeerinfo]: {{summary_getPeerInfo}} {{UPDATED0_10_0}}
+* [GetNetTotals][rpc getnettotals]: {{summary_getNetTotals}} {{UPDATED0_12_0}}
+* [GetNetworkInfo][rpc getnetworkinfo]: {{summary_getNetworkInfo}} {{UPDATED0_13_0}}
+* [GetPeerInfo][rpc getpeerinfo]: {{summary_getPeerInfo}} {{UPDATED0_13_0}}
* [ListBanned][rpc listbanned]: {{summary_listBanned}} {{NEW0_12_0}}
* [Ping][rpc ping]: {{summary_ping-rpc}}
* [SetBan][rpc setban]: {{summary_setBan}} {{NEW0_12_0}}
@@ -131,6 +140,7 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
{% autocrossref %}
* [CreateRawTransaction][rpc createrawtransaction]: {{summary_createRawTransaction}} {{UPDATED0_12_0}}
+* [FundRawTransaction][rpc fundrawtransaction]: {{summary_fundRawTransaction}} {{NEW0_12_0}}, {{UPDATED0_13_0}}
* [DecodeRawTransaction][rpc decoderawtransaction]: {{summary_decodeRawTransaction}}
* [DecodeScript][rpc decodescript]: {{summary_decodeScript}}
* [GetRawTransaction][rpc getrawtransaction]: {{summary_getRawTransaction}}
@@ -147,7 +157,7 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
* [CreateMultiSig][rpc createmultisig]: {{summary_createMultiSig}}
* [EstimateFee][rpc estimatefee]: {{summary_estimateFee}} {{NEW0_10_0}}
-* [EstimatePriority][rpc estimatepriority]: {{summary_estimatePriority}} {{NEW0_10_0}}
+* [EstimatePriority][rpc estimatepriority]: {{summary_estimatePriority}} {{NEW0_10_0}}, {{DEPRECATED}}
* [ValidateAddress][rpc validateaddress]: {{summary_validateAddress}}
* [VerifyMessage][rpc verifymessage]: {{summary_verifyMessage}}
@@ -164,42 +174,46 @@ with [wallet support][]{:#term-wallet-support}{:.term}, which is the
default.
* [AbandonTransaction][rpc abandontransaction]: {{summary_abandonTransaction}} {{NEW0_12_0}}
+* [AddWitnessAddress][rpc addwitnessaddress]: {{summary_addWitnessAddress}} {{NEW0_13_0}}
* [AddMultiSigAddress][rpc addmultisigaddress]: {{summary_addMultiSigAddress}}
* [BackupWallet][rpc backupwallet]: {{summary_backupWallet}}
* [DumpPrivKey][rpc dumpprivkey]: {{summary_dumpPrivKey}}
* [DumpWallet][rpc dumpwallet]: {{summary_dumpWallet}}
* [EncryptWallet][rpc encryptwallet]: {{summary_encryptWallet}}
-* [GetAccountAddress][rpc getaccountaddress]: {{summary_getAccountAddress}}
+* [GetAccountAddress][rpc getaccountaddress]: {{summary_getAccountAddress}} {{DEPRECATED}}
* [GetAccount][rpc getaccount]: {{summary_getAccount}}
-* [GetAddressesByAccount][rpc getaddressesbyaccount]: {{summary_getAddressesByAccount}}
+* [GetAddressesByAccount][rpc getaddressesbyaccount]: {{summary_getAddressesByAccount}} {{DEPRECATED}}
* [GetBalance][rpc getbalance]: {{summary_getBalance}}
* [GetNewAddress][rpc getnewaddress]: {{summary_getNewAddress}}
* [GetRawChangeAddress][rpc getrawchangeaddress]: {{summary_getRawChangeAddress}}
-* [GetReceivedByAccount][rpc getreceivedbyaccount]: {{summary_getReceivedByAccount}}
+* [GetReceivedByAccount][rpc getreceivedbyaccount]: {{summary_getReceivedByAccount}} {{DEPRECATED}}
* [GetReceivedByAddress][rpc getreceivedbyaddress]: {{summary_getReceivedByAddress}}
* [GetTransaction][rpc gettransaction]: {{summary_getTransaction}} {{UPDATED0_12_0}}
* [GetUnconfirmedBalance][rpc getunconfirmedbalance]: {{summary_getUnconfirmedBalance}}
* [GetWalletInfo][rpc getwalletinfo]: {{summary_getWalletInfo}}
* [ImportAddress][rpc importaddress]: {{summary_importAddress}} {{NEW0_10_0}}
+* [ImportPrunedFunds][rpc importprunedfunds]: {{summary_importPrunedFunds}} {{NEW0_13_0}}
* [ImportPrivKey][rpc importprivkey]: {{summary_importPrivKey}}
* [ImportWallet][rpc importwallet]: {{summary_importWallet}}
* [KeyPoolRefill][rpc keypoolrefill]: {{summary_keyPoolRefill}}
-* [ListAccounts][rpc listaccounts]: {{summary_listAccounts}} {{UPDATED0_10_0}}
+* [ListAccounts][rpc listaccounts]: {{summary_listAccounts}} {{UPDATED0_10_0}}, {{DEPRECATED}}
* [ListAddressGroupings][rpc listaddressgroupings]: {{summary_listAddressGroupings}}
* [ListLockUnspent][rpc listlockunspent]: {{summary_listLockUnspent}}
-* [ListReceivedByAccount][rpc listreceivedbyaccount]: {{summary_listReceivedByAccount}} {{UPDATED0_10_0}}
+* [ListReceivedByAccount][rpc listreceivedbyaccount]: {{summary_listReceivedByAccount}} {{UPDATED0_10_0}}, {{DEPRECATED}}
* [ListReceivedByAddress][rpc listreceivedbyaddress]: {{summary_listReceivedByAddress}} {{UPDATED0_10_0}}
* [ListSinceBlock][rpc listsinceblock]: {{summary_listSinceBlock}} {{UPDATED0_10_0}}
* [ListTransactions][rpc listtransactions]: {{summary_listTransactions}} {{UPDATED0_12_1}}
-* [ListUnspent][rpc listunspent]: {{summary_listUnspent}} {{UPDATED0_10_0}}
+* [ListUnspent][rpc listunspent]: {{summary_listUnspent}} {{UPDATED0_13_0}}
* [LockUnspent][rpc lockunspent]: {{summary_lockUnspent}}
-* [Move][rpc move]: {{summary_move}}
-* [SendFrom][rpc sendfrom]: {{summary_sendFrom}}
+* [Move][rpc move]: {{summary_move}} {{DEPRECATED}}
+* [RemovePrunedFunds][rpc removeprunedfunds]: {{summary_removePrunedFunds}} {{NEW0_13_0}}
+* [SendFrom][rpc sendfrom]: {{summary_sendFrom}} {{DEPRECATED}}
* [SendMany][rpc sendmany]: {{summary_sendMany}}
* [SendToAddress][rpc sendtoaddress]: {{summary_sendToAddress}}
-* [SetAccount][rpc setaccount]: {{summary_setAccount}}
+* [SetAccount][rpc setaccount]: {{summary_setAccount}} {{DEPRECATED}}
* [SetTxFee][rpc settxfee]: {{summary_setTxFee}}
-* [SignMessage][rpc signmessage]: {{summary_signMessage}}
+* [SignMessage][rpc signmessage]: {{summary_signMessage}}
+* [SignMessageWithPrivKey][rpc signmessagewithprivkey]: {{summary_signMessageWithPrivKey}} {{NEW0_13_0}}
* [WalletLock][rpc walletlock]: {{summary_walletLock}}
* [WalletPassphrase][rpc walletpassphrase]: {{summary_walletPassphrase}}
* [WalletPassphraseChange][rpc walletpassphrasechange]: {{summary_walletPassphraseChange}}
@@ -212,7 +226,9 @@ default.
{% autocrossref %}
+* [GetGenerate][rpc getgenerate]: {{summary_getGenerate}}
* [GetHashesPerSec][rpc gethashespersec]: {{summary_getHashesPerSec}}
* [GetWork][rpc getwork]: {{summary_getWork}}
+* [SetGenerate][rpc setgenerate]: {{summary_setGenerate}}
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/addwitnessaddress.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/addwitnessaddress.md
new file mode 100644
index 0000000000..b72b2972c5
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/addwitnessaddress.md
@@ -0,0 +1,58 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/addwitnessaddress.md" %}
+
+##### AddWitnessAddress
+{% include helpers/subhead-links.md %}
+
+{% assign summary_addWitnessAddress="adds a witness address for a script (with pubkey or redeemscript known)." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+*Requires wallet support. Requires an unlocked wallet or an
+unencrypted wallet.*
+
+The `addwitnessaddress` RPC {{summary_addWitnessAddress}}
+
+*Parameter #1---the witness address*
+
+{% itemplate ntpd1 %}
+- n: "Address"
+ t: "string (base58)"
+ p: "Required
(exactly 1)"
+ d: "A witness address that gets added to a script. Needs to be in the wallet and uncompressed"
+
+{% enditemplate %}
+
+*Result---the witness script*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "string (base58)"
+ p: "Required
(exactly 1)"
+ d: "The value of the new address (P2SH of witness script)"
+
+{% enditemplate %}
+
+*Example from Bitcoin Core 0.13.1*
+
+{% highlight bash %}
+bitcoin-cli addwitnessaddress 1BRo7qrYHMPrzdBDzfjmzteBdYAyTMXW75
+{% endhighlight %}
+
+Result:
+
+The RPC is disabled by default on mainet as long as Segregated Witness has not been activated.
+`-walletprematurewitness` enables the RPC.
+
+{% highlight text %}
+3LfAujMsBHgQKoxLn59dVbeYPmfUrHSAQb
+{% endhighlight %}
+
+*See also*
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md
index 91ac1951aa..67bac9e39e 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `estimatepriority` RPC {{summary_estimatePriority}}
+{{WARNING}} `estimatepriority` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
Transaction priority is relative to a transaction's byte size.
*Parameter #1---how many blocks the transaction may wait before being included as a free high-priority transaction*
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/fundrawtransaction.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/fundrawtransaction.md
new file mode 100644
index 0000000000..5c467b6525
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/fundrawtransaction.md
@@ -0,0 +1,124 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/fundrawtransaction.md" %}
+
+##### FundRawTransaction
+{% include helpers/subhead-links.md %}
+
+{% assign summary_fundRawTransaction="adds inputs to a transaction until it has enough in value to meet its out value." %}
+
+{% autocrossref %}
+
+*Requires wallet support.*
+
+The `fundrawtransaction` RPC {{summary_fundRawTransaction}} This will not modify existing inputs, and will add one change output to the outputs.
+Note that inputs which were signed may need to be resigned after completion since in/outputs have been added. The inputs added will not be signed, use signrawtransaction for that.
+All existing inputs must have their previous output transaction be in the wallet.
+
+*Parameter #1---The hex string of the raw transaction*
+
+{% itemplate ntpd1 %}
+- n: "Hexstring"
+ t: "string (hex)"
+ p: "Required
(exactly 1)"
+ d: "The hex string of the raw transaction"
+
+{% enditemplate %}
+
+*Parameter #2---Additional options*
+
+{% itemplate ntpd1 %}
+- n: "Options"
+ t: "Object"
+ p: "Optional
(0 or 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
Additional options"
+
+- n: "→
`changeAddress`"
+ t: "string"
+ p: "Optional
(0 or 1)"
+ d: "The bitcoin address to receive the change. If not set, the address is chosen from address pool"
+
+- n: "→
`changePosition`"
+ t: "nummeric "
+ p: "Optional
(0 or 1)"
+ d: "The index of the change output. If not set, the change position is randomly chosen"
+
+- n: "→
`includeWatching`"
+ t: "bool"
+ p: "Optional
(0 or 1)"
+ d: "Inputs from watch-only addresses are also considered. The default is `false`"
+
+- n: "→
`lockUnspent`"
+ t: "bool"
+ p: "Optional
(0 or 1)"
+ d: "The selected outputs are locked after running the rpc call. The default is `false`"
+
+- n: "→
`feeRate`"
+ t: "numeric (bitcoins)"
+ p: "Optional
(0 or 1)"
+ d: "The specific feerate you are willing to pay(BTC per KB). If not set, the wallet determines the fee"
+
+{% enditemplate %}
+
+*Result---information about the created transaction*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "object"
+ p: "Required
(exactly 1)"
+ d: "An object including information about the created transaction"
+
+- n: "→
hex"
+ t: "string (hex)"
+ p: "Required
(Exactly 1)"
+ d: "The resulting unsigned raw transaction in serialized transaction format encoded as hex"
+
+- n: "→
fee"
+ t: "numeric (bitcoins)"
+ p: "Required
(Exactly 1)"
+ d: "Fee in BTC the resulting transaction pays"
+
+- n: "→
changepos"
+ t: "numeric (int)"
+ p: "Required
(Exactly 1)"
+ d: "The position of the added change output, or `-1` if no change output was added"
+
+{% enditemplate %}
+
+*Example from Bitcoin Core 0.13.1*
+
+{% highlight bash %}
+bitcoin-cli -testnet fundrawtransaction 01000000011da9283b4ddf8d\
+89eb996988b89ead56cecdc44041ab38bf787f1206cd90b51e0000000000ffff\
+ffff01405dc600000000001976a9140dfc8bafc8419853b34d5e072ad37d1a51\
+59f58488ac00000000
+{
+ "changeAddress": "15gJiApWFGTN2iTteQwQbqasdT6dwGWwv6",
+ "changePosition" : "",
+ "includeWatching" : false,
+ "lockUnspents" : true,
+ "feeRate" : 0.0001
+}
+{% endhighlight %}
+
+Result:
+
+{% highlight text %}
+{
+ "hex": "01000000011da9283b4ddf8d89eb996988b89ead56cecdc44041ab38bf787f1206cd90b51e0000000000ffffffff01405dc600000000001976a9140dfc8bafc8419853b34d5e072ad37d1a5159f58488ac00000000",
+ "fee": 0.0000245,
+ "changepos": 2
+}
+{% endhighlight %}
+
+*See also*
+
+* [CreateRawTransaction][rpc createrawtransaction]: {{summary_createRawTransaction}}
+* [DecodeRawTransaction][rpc decoderawtransaction]: {{summary_decodeRawTransaction}}
+* [SignRawTransaction][rpc signrawtransaction]: {{summary_signRawTransaction}}
+* [SendRawTransaction][rpc sendrawtransaction]: {{summary_sendRawTransaction}}
+* [Serialized Transaction Format][raw transaction format]
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/generate.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/generate.md
index 586fefdec1..b3b5a6c5a3 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/generate.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/generate.md
@@ -7,7 +7,7 @@ http://opensource.org/licenses/MIT.
##### Generate
{% include helpers/subhead-links.md %}
-{% assign summary_generate="nearly instantly generates blocks (in regtest mode only)" %}
+{% assign summary_generate="nearly instantly generates blocks." %}
{% autocrossref %}
@@ -21,7 +21,18 @@ The `generate` RPC {{summary_generate}}
- n: "Blocks"
t: "number (int)"
p: "Required
(exactly 1)"
- d: "The number of blocks to generate. The RPC call will not return until all blocks have been generated"
+ d: "The number of blocks to generate. The RPC call will not return until all blocks have been generated or the maxium number of iterations has been reached"
+
+{% enditemplate %}
+
+*Parameter #2---the maximum number of iterations to try*
+
+{% itemplate ntpd1 %}
+- n: "Maxtries"
+ t: "number (int)"
+ p: "Optional
(0 or 1)"
+ d: "The maximum number of iterations that are tried to create the requested number of blocks. Default is `1000000`"
+
{% enditemplate %}
*Result---the generated block header hashes*
@@ -38,12 +49,12 @@ The `generate` RPC {{summary_generate}}
d: "The hashes of the headers of the blocks generated in regtest mode, as hex in RPC byte order"
{% enditemplate %}
-*Examples from Bitcoin Core master (commit c2fa0846)*
+*Example from Bitcoin Core 0.13.1*
-Using regtest mode, generate 2 blocks:
+Using regtest mode (also works in normal mode), generate 2 blocks:
{% highlight bash %}
-bitcoin-cli -regtest generate 2
+bitcoin-cli -regtest generate 2 500000
{% endhighlight %}
Result:
@@ -57,7 +68,7 @@ Result:
*See also*
-* [SetGenerate][rpc getgenerate]: {{summary_getGenerate}}
+* [GenerateToAddress][rpc generatetoaddress]: {{summary_generateToAddress}}
* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}}
* [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/generatetoaddress.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/generatetoaddress.md
new file mode 100644
index 0000000000..41bec74cef
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/generatetoaddress.md
@@ -0,0 +1,88 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/generatetoaddress.md" %}
+
+##### GenerateToAddress
+{% include helpers/subhead-links.md %}
+
+{% assign summary_generateToAddress="mines blocks immediately to a specified address." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+*Requires wallet support.*
+
+The `generatetoaddress` RPC {{summary_generateToAddress}}
+
+*Parameter #1---the number of blocks to generate*
+
+{% itemplate ntpd1 %}
+- n: "Blocks"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of blocks to generate. The RPC call will not return until all blocks have been generated or the maxium number of iterations has been reached"
+
+{% enditemplate %}
+
+*Parameter #2---a transaction identifier (TXID)*
+
+{% itemplate ntpd1 %}
+- n: "Address"
+ t: "string (base58)"
+ p: "Required
(exactly 1)"
+ d: "The address to send the newly generated Bitcoin to"
+
+{% enditemplate %}
+
+*Parameter #3---the maximum number of iterations to try*
+
+{% itemplate ntpd1 %}
+- n: "Maxtries"
+ t: "number (int)"
+ p: "Optional
(0 or 1)"
+ d: "The maximum number of iterations that are tried to create the requested number of blocks. Default is `1000000`"
+
+{% enditemplate %}
+
+*Result---the generated block header hashes*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "array"
+ p: "Required
(exactly 1)"
+ d: "An array containing the block header hashes of the generated blocks (may be empty if used with `generate 0`)"
+
+- n: "→
Header Hashes"
+ t: "string (hex)"
+ p: "Required
(1 or more)"
+ d: "The hashes of the headers of the blocks generated, as hex in RPC byte order"
+{% enditemplate %}
+
+*Example from Bitcoin Core 0.13.1*
+
+Using regtest mode, generate 2 blocks with maximal 500000 iterations:
+
+{% highlight bash %}
+bitcoin-cli -regtest generatetoaddress 2 "1BRo7qrYHMPrzdBDzfjmzt\
+eBdYAyTMXW75" 500000
+{% endhighlight %}
+
+Result:
+
+{% highlight json %}
+[
+ "36252b5852a5921bdfca8701f936b39edeb1f8c39fffe73b0d8437921401f9af",
+ "5f2956817db1e386759aa5794285977c70596b39ea093b9eab0aa4ba8cd50c06"
+]
+{% endhighlight %}
+
+*See also*
+
+* [Generate][rpc generate]: {{summary_generate}}
+* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}}
+* [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}}
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaccountaddress.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaccountaddress.md
index 1be2c37953..04bb66a4a9 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaccountaddress.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaccountaddress.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `getaccountaddress` RPC {{summary_getAccountAddress}}
+{{WARNING}} `getaccountaddress` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---an account name*
{% itemplate ntpd1 %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaddressesbyaccount.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaddressesbyaccount.md
index c8f0b4f43a..570fd62760 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaddressesbyaccount.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getaddressesbyaccount.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `getaddressesbyaccount` RPC {{summary_getAddressesByAccount}}
+{{WARNING}} `getaddressesbyaccount` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---the account name*
{% itemplate ntpd1 %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getgenerate.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getgenerate.md
index e2637e2bcd..f94383dd57 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getgenerate.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getgenerate.md
@@ -7,42 +7,20 @@ http://opensource.org/licenses/MIT.
##### GetGenerate
{% include helpers/subhead-links.md %}
-{% assign summary_getGenerate="returns true if the node is set to generate blocks using its CPU." %}
+{% assign summary_getGenerate="was removed in Bitcoin Core 0.13.0." %}
{% autocrossref %}
*Requires wallet support.*
-The `getgenerate` RPC {{summary_getGenerate}}
-
-*Parameters: none*
-
-*Result---whether the server is set to generate blocks*
-
-{% itemplate ntpd1 %}
-- n: "`result`"
- t: "bool"
- p: "Required
(exactly 1)"
- d: "Set to `true` if the server is set to generate blocks; set to `false` if it is not"
-
-{% enditemplate %}
-
-*Example from Bitcoin Core 0.10.0*
-
-{% highlight bash %}
-bitcoin-cli -testnet getgenerate
-{% endhighlight %}
-
-Result:
-
-{% highlight json %}
-false
-{% endhighlight %}
+The `getgenerate` RPC {{summary_getGenerate}} If you have an older
+version of Bitcoin Core, use `help getgenerate` to get help.
*See also*
-* [SetGenerate][rpc setgenerate]: {{summary_setGenerate}}
+* [Generate][rpc generate]: {{summary_generate}}
+* [GenerateToAddress][rpc generatetoaddress]: {{summary_generateToAddress}}
* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}}
-* [GetHashesPerSec][rpc gethashespersec]: {{summary_getHashesPerSec}}
+
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/gethashespersec.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/gethashespersec.md
index eefb3141df..370cc7424d 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/gethashespersec.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/gethashespersec.md
@@ -7,41 +7,18 @@ http://opensource.org/licenses/MIT.
##### GetHashesPerSec
{% include helpers/subhead-links.md %}
-{% assign summary_getHashesPerSec="was removed in Bitcoin Core master (unreleased). It returned a recent hashes per second performance measurement when the node was generating blocks." %}
+{% assign summary_getHashesPerSec="was removed in Bitcoin Core 0.11.0." %}
{% autocrossref %}
*Requires wallet support.*
-The `gethashespersec` RPC {{summary_getHashesPerSec}}
-
-*Parameters: none*
-
-*Result---the number of hashes your computer generated per second*
-
-{% itemplate ntpd1 %}
-- n: "`result`"
- t: "number (int)"
- p: "Required
(exactly 1)"
- d: "If generation is enabled, the number of hashes per second your computer most recently generated. If generation is disabled, the value `0`"
-
-{% enditemplate %}
-
-*Example from Bitcoin Core 0.10.0*
-
-{% highlight bash %}
-bitcoin-cli -testnet gethashespersec
-{% endhighlight %}
-
-Result:
-
-{% highlight json %}
-1995356
-{% endhighlight %}
+The `gethashespersec` RPC {{summary_getHashesPerSec}} If you have an older
+version of Bitcoin Core, use `help gethashespersec` to get help.
*See also*
-* [SetGenerate][rpc setgenerate]: {{summary_setGenerate}}
+* [Generate][rpc generate]: {{summary_generate}}
* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}}
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolancestors.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolancestors.md
new file mode 100644
index 0000000000..2b8c5af211
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolancestors.md
@@ -0,0 +1,214 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolancestors.md" %}
+
+##### GetMemPoolAncestors
+{% include helpers/subhead-links.md %}
+
+{% assign summary_getMemPoolAncestors="returns all in-mempool ancestors for a transaction in the mempool." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+The `getmempoolancestors` RPC {{summary_getMemPoolAncestors}}
+
+*Parameter #1---a transaction identifier (TXID)*
+
+{% itemplate ntpd1 %}
+- n: "Address"
+ t: "string"
+ p: "Required
(exactly 1)"
+ d: "The address whose transactions should be tallied"
+
+{% enditemplate %}
+
+*Parameter #2---desired output format*
+
+{% itemplate ntpd1 %}
+- n: "Format"
+ t: "bool"
+ p: "Optional
(0 or 1)"
+ d: "Set to `true` to get json objects describing each transaction in the memory pool; set to `false` (the default) to only get an array of TXIDs"
+
+{% enditemplate %}
+
+*Result---list of ancestor transactions*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "array"
+ p: "Required
(exactly 1)"
+ d: "An array of TXIDs belonging to transactions in the memory pool. The array may be empty if there are no transactions in the memory pool"
+
+- n: "→
TXID"
+ t: "string"
+ p: "Optional
(0 or more)"
+ d: "The TXID of a transaction in the memory pool, encoded as hex in RPC byte order"
+
+{% enditemplate %}
+
+*Result (format: `true`)---a JSON object describing each transaction*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "object"
+ p: "Required
(exactly 1)"
+ d: "A object containing transactions currently in the memory pool. May be empty"
+
+- n: "→
TXID"
+ t: "string : object"
+ p: "Optional
(0 or more)"
+ d: "The TXID of a transaction in the memory pool, encoded as hex in RPC byte order"
+
+- n: "→ →
`size`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of the serialized transaction in bytes"
+
+- n: "→ →
`fee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee paid by the transaction in decimal bitcoins"
+
+- n: "→ →
`modifiedfee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee with fee deltas used for mining priority in decimal bitcoins"
+
+- n: "→ →
`time`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The time the transaction entered the memory pool, Unix epoch time format"
+
+- n: "→ →
`height`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The block height when the transaction entered the memory pool"
+
+- n: "→ →
`startingpriority`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The priority of the transaction when it first entered the memory pool"
+
+- n: "→ →
`currentpriority`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The current priority of the transaction"
+
+- n: "→ →
`descendantcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of in-mempool descendant transactions (including this one)"
+
+- n: "→ →
`descendantsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of in-mempool descendants (including this one)"
+
+- n: "→ →
`descendantfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The modified fees (see `modifiedfee` above) of in-mempool descendants (including this one)"
+
+- n: "→ →
`ancestorcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of in-mempool ancestor transactions (including this one)"
+
+- n: "→ →
`ancestorsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of in-mempool ancestors (including this one)"
+
+- n: "→ →
`ancestorfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The modified fees (see `modifiedfee` above) of in-mempool ancestors (including this one)"
+
+- n: "→ →
`depends`"
+ t: "array"
+ p: "Required
(exactly 1)"
+ d: "An array holding TXIDs of unconfirmed transactions this transaction depends upon (parent transactions). Those transactions must be part of a block before this transaction can be added to a block, although all transactions may be included in the same block. The array may be empty"
+
+- n: "→ → →
Depends TXID"
+ t: "string"
+ p: "Optional (0 or more)"
+ d: "The TXIDs of any unconfirmed transactions this transaction depends upon, encoded as hex in RPC byte order"
+
+{% enditemplate %}
+
+*Examples from Bitcoin Core 0.13.1*
+
+The default (`false`):
+
+{% highlight bash %}
+bitcoin-cli getmempoolancestors 52273e0ce6cf3452932cfbc1c517c0ce\
+1af1d255fda67a6e3bd63ba1d908c8c2
+{% endhighlight %}
+
+Result:
+
+{% highlight json %}
+[
+ "b104586f229e330caf42c475fd52684e9eb5e2d02f0fcd216d9554c5347b0873",
+ "094f7dcbc7494510d4daeceb2941ed73b1bd011bf527f6c3b7c897fee85c11d4"
+]
+{% endhighlight %}
+
+Verbose output (`true`):
+
+{% highlight bash %}
+bitcoin-cli getmempoolancestors 52273e0ce6cf3452932cfbc1c517c0ce\
+1af1d255fda67a6e3bd63ba1d908c8c2 true
+{% endhighlight %}
+
+Result:
+
+{% highlight json %}
+{
+ "b104586f229e330caf42c475fd52684e9eb5e2d02f0fcd216d9554c5347b0873": {
+ "size": 485,
+ "fee": 0.00009700,
+ "modifiedfee": 0.00009700,
+ "time": 1479423635,
+ "height": 439431,
+ "startingpriority": 15327081.81818182,
+ "currentpriority": 21536936.36363636,
+ "descendantcount": 1,
+ "descendantsize": 485,
+ "descendantfees": 9700,
+ "ancestorcount": 1,
+ "ancestorsize": 485,
+ "ancestorfees": 9700,
+ "depends": [
+ ]
+ },
+ "094f7dcbc7494510d4daeceb2941ed73b1bd011bf527f6c3b7c897fee85c11d4": {
+ "size": 554,
+ "fee": 0.00005540,
+ "modifiedfee": 0.00005540,
+ "time": 1479423327,
+ "height": 439430,
+ "startingpriority": 85074.91071428571,
+ "currentpriority": 3497174.4375,
+ "descendantcount": 1,
+ "descendantsize": 554,
+ "descendantfees": 5540,
+ "ancestorcount": 1,
+ "ancestorsize": 554,
+ "ancestorfees": 5540,
+ "depends": [
+ ]
+ }
+}
+{% endhighlight %}
+
+*See also*
+
+* [GetMemPoolDescendants][rpc getmempooldescendants]: {{summary_getMemPoolDescendants}}
+* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}}
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempooldescendants.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempooldescendants.md
new file mode 100644
index 0000000000..3cc2eeeb56
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempooldescendants.md
@@ -0,0 +1,214 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempooldescendants.md" %}
+
+##### GetMemPoolDescendants
+{% include helpers/subhead-links.md %}
+
+{% assign summary_getMemPoolDescendants="returns all in-mempool descendants for a transaction in the mempool." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+The `getmempooldescendants` RPC {{summary_getMemPoolDescendants}}
+
+*Parameter #1---a transaction identifier (TXID)*
+
+{% itemplate ntpd1 %}
+- n: "Address"
+ t: "string"
+ p: "Required
(exactly 1)"
+ d: "The address whose transactions should be tallied"
+
+{% enditemplate %}
+
+*Parameter #2---desired output format*
+
+{% itemplate ntpd1 %}
+- n: "Format"
+ t: "bool"
+ p: "Optional
(0 or 1)"
+ d: "Set to `true` to get json objects describing each transaction in the memory pool; set to `false` (the default) to only get an array of TXIDs"
+
+{% enditemplate %}
+
+*Result---list of descendant transactions*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "array"
+ p: "Required
(exactly 1)"
+ d: "An array of TXIDs belonging to transactions in the memory pool. The array may be empty if there are no transactions in the memory pool"
+
+- n: "→
TXID"
+ t: "string"
+ p: "Optional
(0 or more)"
+ d: "The TXID of a transaction in the memory pool, encoded as hex in RPC byte order"
+
+{% enditemplate %}
+
+*Result (format: `true`)---a JSON object describing each transaction*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "object"
+ p: "Required
(exactly 1)"
+ d: "A object containing transactions currently in the memory pool. May be empty"
+
+- n: "→
TXID"
+ t: "string : object"
+ p: "Optional
(0 or more)"
+ d: "The TXID of a transaction in the memory pool, encoded as hex in RPC byte order"
+
+- n: "→ →
`size`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of the serialized transaction in bytes"
+
+- n: "→ →
`fee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee paid by the transaction in decimal bitcoins"
+
+- n: "→ →
`modifiedfee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee with fee deltas used for mining priority in decimal bitcoins"
+
+- n: "→ →
`time`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The time the transaction entered the memory pool, Unix epoch time format"
+
+- n: "→ →
`height`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The block height when the transaction entered the memory pool"
+
+- n: "→ →
`startingpriority`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The priority of the transaction when it first entered the memory pool"
+
+- n: "→ →
`currentpriority`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The current priority of the transaction"
+
+- n: "→ →
`descendantcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of in-mempool descendant transactions (including this one)"
+
+- n: "→ →
`descendantsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of in-mempool descendants (including this one)"
+
+- n: "→ →
`descendantfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The modified fees (see `modifiedfee` above) of in-mempool descendants (including this one)"
+
+- n: "→ →
`ancestorcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of in-mempool ancestor transactions (including this one)"
+
+- n: "→ →
`ancestorsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of in-mempool ancestors (including this one)"
+
+- n: "→ →
`ancestorfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The modified fees (see `modifiedfee` above) of in-mempool ancestors (including this one)"
+
+- n: "→ →
`depends`"
+ t: "array"
+ p: "Required
(exactly 1)"
+ d: "An array holding TXIDs of unconfirmed transactions this transaction depends upon (parent transactions). Those transactions must be part of a block before this transaction can be added to a block, although all transactions may be included in the same block. The array may be empty"
+
+- n: "→ → →
Depends TXID"
+ t: "string"
+ p: "Optional (0 or more)"
+ d: "The TXIDs of any unconfirmed transactions this transaction depends upon, encoded as hex in RPC byte order"
+
+{% enditemplate %}
+
+*Examples from Bitcoin Core 0.13.1*
+
+The default (`false`):
+
+{% highlight bash %}
+bitcoin-cli getmempooldescendants 52273e0ce6cf3452932cfbc1c517c0\
+ce1af1d255fda67a6e3bd63ba1d908c8c2
+{% endhighlight %}
+
+Result:
+
+{% highlight json %}
+[
+ "b104586f229e330caf42c475fd52684e9eb5e2d02f0fcd216d9554c5347b0873",
+ "094f7dcbc7494510d4daeceb2941ed73b1bd011bf527f6c3b7c897fee85c11d4"
+]
+{% endhighlight %}
+
+Verbose output (`true`):
+
+{% highlight bash %}
+bitcoin-cli getmempooldescendants 52273e0ce6cf3452932cfbc1c517c0\
+ce1af1d255fda67a6e3bd63ba1d908c8c2 true
+{% endhighlight %}
+
+Result:
+
+{% highlight json %}
+{
+ "b104586f229e330caf42c475fd52684e9eb5e2d02f0fcd216d9554c5347b0873": {
+ "size": 485,
+ "fee": 0.00009700,
+ "modifiedfee": 0.00009700,
+ "time": 1479423635,
+ "height": 439431,
+ "startingpriority": 15327081.81818182,
+ "currentpriority": 21536936.36363636,
+ "descendantcount": 1,
+ "descendantsize": 485,
+ "descendantfees": 9700,
+ "ancestorcount": 1,
+ "ancestorsize": 485,
+ "ancestorfees": 9700,
+ "depends": [
+ ]
+ },
+ "094f7dcbc7494510d4daeceb2941ed73b1bd011bf527f6c3b7c897fee85c11d4": {
+ "size": 554,
+ "fee": 0.00005540,
+ "modifiedfee": 0.00005540,
+ "time": 1479423327,
+ "height": 439430,
+ "startingpriority": 85074.91071428571,
+ "currentpriority": 3497174.4375,
+ "descendantcount": 1,
+ "descendantsize": 554,
+ "descendantfees": 5540,
+ "ancestorcount": 1,
+ "ancestorsize": 554,
+ "ancestorfees": 5540,
+ "depends": [
+ ]
+ }
+}
+{% endhighlight %}
+
+*See also*
+
+* [GetMemPoolAncestors][rpc getmempoolancestors]: {{summary_getMemPoolAncestors}}
+* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}}
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolentry.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolentry.md
new file mode 100644
index 0000000000..a159280ecb
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolentry.md
@@ -0,0 +1,148 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolentry.md" %}
+
+##### GetMemPoolEntry
+{% include helpers/subhead-links.md %}
+
+{% assign summary_getMemPoolEntry="returns mempool data for given transaction (must be in mempool)." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+The `getmempoolentry` RPC {{summary_getMemPoolEntry}}
+
+*Parameter #1---a transaction identifier (TXID)*
+
+{% itemplate ntpd1 %}
+- n: "Address"
+ t: "string"
+ p: "Required
(exactly 1)"
+ d: "The address whose transactions should be tallied"
+
+{% enditemplate %}
+
+*Result ---a JSON object describing the transaction*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "object"
+ p: "Required
(exactly 1)"
+ d: "A object containing transactions currently in the memory pool. May be empty"
+
+- n: "→
`size`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of the serialized transaction in bytes"
+
+- n: "→
`fee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee paid by the transaction in decimal bitcoins"
+
+- n: "→
`modifiedfee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee with fee deltas used for mining priority in decimal bitcoins"
+
+- n: "→
`time`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The time the transaction entered the memory pool, Unix epoch time format"
+
+- n: "→
`height`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The block height when the transaction entered the memory pool"
+
+- n: "→
`startingpriority`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The priority of the transaction when it first entered the memory pool"
+
+- n: "→
`currentpriority`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The current priority of the transaction"
+
+- n: "→
`descendantcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of in-mempool descendant transactions (including this one)"
+
+- n: "→
`descendantsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of in-mempool descendants (including this one)"
+
+- n: "→
`descendantfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The modified fees (see `modifiedfee` above) of in-mempool descendants (including this one)"
+
+- n: "→
`ancestorcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The number of in-mempool ancestor transactions (including this one)"
+
+- n: "→
`ancestorsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The size of in-mempool ancestors (including this one)"
+
+- n: "→
`ancestorfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The modified fees (see `modifiedfee` above) of in-mempool ancestors (including this one)"
+
+- n: "→
`depends`"
+ t: "array"
+ p: "Required
(exactly 1)"
+ d: "An array holding TXIDs of unconfirmed transactions this transaction depends upon (parent transactions). Those transactions must be part of a block before this transaction can be added to a block, although all transactions may be included in the same block. The array may be empty"
+
+- n: "→ →
Depends TXID"
+ t: "string"
+ p: "Optional (0 or more)"
+ d: "The TXIDs of any unconfirmed transactions this transaction depends upon, encoded as hex in RPC byte order"
+
+{% enditemplate %}
+
+*Examples from Bitcoin Core 0.13.1*
+
+{% highlight bash %}
+bitcoin-cli getmempoolentry 52273e0ce6cf3452932cfbc1c517c0ce1af1\
+d255fda67a6e3bd63ba1d908c8c2
+{% endhighlight %}
+
+Result:
+
+{% highlight json %}
+{
+ "size": 485,
+ "fee": 0.00009700,
+ "modifiedfee": 0.00009700,
+ "time": 1479423635,
+ "height": 439431,
+ "startingpriority": 15327081.81818182,
+ "currentpriority": 21536936.36363636,
+ "descendantcount": 1,
+ "descendantsize": 485,
+ "descendantfees": 9700,
+ "ancestorcount": 1,
+ "ancestorsize": 485,
+ "ancestorfees": 9700,
+ "depends": [
+ ]
+}
+{% endhighlight %}
+
+*See also*
+
+* [GetMemPoolAncestors][rpc getmempoolancestors]: {{summary_getMemPoolAncestors}}
+* [GetMemPoolDescendants][rpc getmempooldescendants]: {{summary_getMemPoolDescendants}}
+* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}}
+
+{% endautocrossref %}
\ No newline at end of file
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmininginfo.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmininginfo.md
index 8ca031bf19..0598493a54 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmininginfo.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmininginfo.md
@@ -51,7 +51,7 @@ The `getmininginfo` RPC {{summary_getMiningInfo}}
- n: "→
`genproclimit`"
t: "number (int)"
p: "Required
(exactly 1)"
- d: "The limit on the number of processors to use for generation. If generation was enabled since the last time this node was restarted, this is the number used in the second parameter of the `setgenerate` RPC (or the default). Otherwise, it is `-1`"
+ d: "*Removed in Bitcoin Core 0.13.0*
The limit on the number of processors to use for generation. If generation was enabled since the last time this node was restarted, this is the number used in the second parameter of the `setgenerate` RPC (or the default). Otherwise, it is `-1`"
- n: "→
`networkhashps`"
t: "number (int)"
@@ -71,21 +71,21 @@ The `getmininginfo` RPC {{summary_getMiningInfo}}
- n: "→
`chain`"
t: "string"
p: "Required
(exactly 1)"
- d: "Set to `main` for mainnet, `test` for testnet, and `regtest` for regtest"
+ d: "*Added in Bitcoin Core 0.10.0*
Set to `main` for mainnet, `test` for testnet, and `regtest` for regtest"
- n: "→
`generate`"
t: "bool"
p: "Optional
(0 or 1)"
- d: "Set to `true` if generation is currently enabled; set to `false` if generation is currently disabled. Only returned if the node has wallet support enabled"
+ d: "*Removed in Bitcoin Core 0.13.0*
Set to `true` if generation is currently enabled; set to `false` if generation is currently disabled. Only returned if the node has wallet support enabled"
- n: "→
`hashespersec`"
t: "number (int)"
p: "Optional
(0 or 1)"
- d: "*Removed in Bitcoin Core master (unreleased)*
The approximate number of hashes per second this node is generating across all CPUs, if generation is enabled. Otherwise `0`. Only returned if the node has wallet support enabled"
+ d: "*Removed in Bitcoin Core 0.11.0*
The approximate number of hashes per second this node is generating across all CPUs, if generation is enabled. Otherwise `0`. Only returned if the node has wallet support enabled"
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
{% highlight bash %}
bitcoin-cli -testnet getmininginfo
@@ -100,13 +100,10 @@ Result:
"currentblocktx" : 3,
"difficulty" : 1.00000000,
"errors" : "",
- "genproclimit" : 1,
"networkhashps" : 5699977416637,
"pooledtx" : 8,
"testnet" : true,
"chain" : "test",
- "generate" : true,
- "hashespersec" : 921200
}
{% endhighlight %}
@@ -115,6 +112,6 @@ Result:
* [GetMemPoolInfo][rpc getmempoolinfo]: {{summary_getMemPoolInfo}}
* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}}
* [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}}
-* [SetGenerate][rpc setgenerate]: {{summary_setGenerate}}
+* [Generate][rpc generate]: {{summary_generate}}
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnettotals.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnettotals.md
index 88bd317882..295b7fab01 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnettotals.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnettotals.md
@@ -37,22 +37,65 @@ The `getnettotals` RPC {{summary_getNetTotals}}
t: "number (int)"
p: "Required
(exactly 1)"
d: "Unix epoch time in milliseconds according to the operating system's clock (not the node adjusted time)"
+
+- n: "→
`uploadtarget`"
+ t: "string :
object"
+ p: "Required
(exactly 1)"
+ d: "The upload traget information"
+
+- n: "→ →
`timeframe`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "Length of the measuring timeframe in seconds. The timeframe is currently set to `24` hours"
+
+- n: "→ →
`target`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "The maximum allowed outbound traffic in bytes. The default is `0`. Can be changed with `-maxuploadtarget`"
+
+- n: "→ →
`target_reached`"
+ t: "bool"
+ p: "Required
(exactly 1)"
+ d: "Indicates if the target is reached. If the target is reached the node won't serve SPV and historical block requests anymore"
+
+- n: "→ →
`serve_historical_blocks`"
+ t: "bool"
+ p: "Required
(exactly 1)"
+ d: "Indicates if historical blocks are served"
+
+- n: "→ →
`bytes_left_in_cycle`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "Amount of bytes left in current time cycle. `0` is displayed if no upload target is set"
+
+- n: "→ →
`time_left_in_cycle`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "Seconds left in current time cycle. `0` is displayed if no upload target is set"
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
{% highlight bash %}
-bitcoin-cli -testnet getnettotals
+bitcoin-cli getnettotals
{% endhighlight %}
Result:
{% highlight json %}
{
- "totalbytesrecv" : 723992206,
- "totalbytessent" : 16846662695,
- "timemillis" : 1419268217354
+ "totalbytesrecv": 7137052851,
+ "totalbytessent": 211648636140,
+ "timemillis": 1481227418585,
+ "uploadtarget": {
+ "timeframe": 86400,
+ "target": 0,
+ "target_reached": false,
+ "serve_historical_blocks": true,
+ "bytes_left_in_cycle": 0,
+ "time_left_in_cycle": 0
+ }
}
{% endhighlight %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnetworkinfo.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnetworkinfo.md
index afd4adc68d..78910a64eb 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnetworkinfo.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getnetworkinfo.md
@@ -37,6 +37,16 @@ The `getnetworkinfo` RPC {{summary_getNetworkInfo}}
t: "number (int)"
p: "Required
(exactly 1)"
d: "The protocol version number used by this node. See the [protocol versions section][section protocol versions] for more information"
+
+- n: "→
`localservices`"
+ t: "string (hex)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.10.0*
The services supported by this node as advertised in its `version` message"
+
+- n: "→
`localrelay`"
+ t: "bool"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
The services supported by this node as advertised in its `version` message"
- n: "→
`timeoffset`"
t: "number (int)"
@@ -48,21 +58,6 @@ The `getnetworkinfo` RPC {{summary_getNetworkInfo}}
p: "Required
(exactly 1)"
d: "The total number of open connections (both outgoing and incoming) between this node and other nodes"
-- n: "→
`proxy`"
- t: "string"
- p: "Required
(exactly 1)"
- d: "The hostname/IP address and port number of the proxy, if set, or an empty string if unset"
-
-- n: "→
`relayfee`"
- t: "number (bitcoins)"
- p: "Required
(exactly 1)"
- d: "The minimum fee a low-priority transaction must pay in order for this node to accept it into its memory pool"
-
-- n: "→
`localservices`"
- t: "string (hex)"
- p: "Required
(exactly 1)"
- d: "*Added in Bitcoin Core 0.10.0*
The services supported by this node as advertised in its `version` message"
-
- n: "→
`networks`"
t: "array"
p: "Required
(exactly 1)"
@@ -92,85 +87,98 @@ The `getnetworkinfo` RPC {{summary_getNetworkInfo}}
t: "string"
p: "Required
(exactly 1)"
d: "The hostname and port of any proxy being used for this network. If a proxy is not in use, an empty string"
+
+- n: "→ → →
`proxy_randomize_credentials`"
+ t: "bool"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.11.0*
Set to `true` if randomized credentials are set for this proxy. Otherwise set to `false`"
+
+- n: "→
`relayfee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The minimum fee a low-priority transaction must pay in order for this node to accept it into its memory pool"
-- n: "→ → →
`localaddresses`"
+- n: "→
`localaddresses`"
t: "array"
p: "Required
(exactly 1)"
d: "An array of objects each describing the local addresses this node believes it listens on"
-- n: "→ → → →
Address"
+- n: "→ →
Address"
t: "object"
p: "Optional
(0 or more)"
d: "An object describing a particular address this node believes it listens on"
-- n: "→ → → → →
`address`"
+- n: "→ → →
`address`"
t: "string"
p: "Required
(exactly 1)"
d: "An IP address or .onion address this node believes it listens on. This may be manually configured, auto detected, or based on `version` messages this node received from its peers"
-- n: "→ → → → →
`port`"
+- n: "→ → →
`port`"
t: "number (int)"
p: "Required
(exactly 1)"
d: "The port number this node believes it listens on for the associated `address`. This may be manually configured, auto detected, or based on `version` messages this node received from its peers"
-- n: "→ → → → →
`score`"
+- n: "→ → →
`score`"
t: "number (int)"
p: "Required
(exactly 1)"
- d: >
- The number of incoming connections during the uptime of this node
- that have used this address in their `version` message
+ d: "The number of incoming connections during the uptime of this node that have used this address in their `version` message"
+
+- n: "→
`warnings`"
+ t: "string"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.11.0*
A plain-text description of any network warnings. If there are no warnings, an empty string will be returned. "
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
{% highlight bash %}
-bitcoin-cli -testnet getnetworkinfo
+bitcoin-cli getnetworkinfo
{% endhighlight %}
Result (actual addresses have been replaced with reserved addresses):
{% highlight json %}
{
- "version" : 100000,
- "subversion" : "/Satoshi:0.10.0/",
- "protocolversion" : 70002,
- "localservices" : "0000000000000001",
- "timeoffset" : 0,
- "connections" : 51,
- "networks" : [
- {
- "name" : "ipv4",
- "limited" : false,
- "reachable" : true,
- "proxy" : ""
- },
- {
- "name" : "ipv6",
- "limited" : false,
- "reachable" : true,
- "proxy" : ""
- },
- {
- "name" : "onion",
- "limited" : false,
- "reachable" : false,
- "proxy" : ""
- }
- ],
- "relayfee" : 0.00001000,
- "localaddresses" : [
- {
- "address" : "192.0.2.113",
- "port" : 18333,
- "score" : 6470
- },
- {
- "address" : "0600:3c03::f03c:91ff:fe89:dfc4",
- "port" : 18333,
- "score" : 2029
- }
- ]
+ "version": 130100,
+ "subversion": "/Satoshi:0.13.1/",
+ "protocolversion": 70014,
+ "localservices": "000000000000000d",
+ "localrelay": true,
+ "timeoffset": -19,
+ "connections": 8,
+ "networks": [
+ {
+ "name": "ipv4",
+ "limited": false,
+ "reachable": true,
+ "proxy": "",
+ "proxy_randomize_credentials": false
+ },
+ {
+ "name": "ipv6",
+ "limited": false,
+ "reachable": true,
+ "proxy": "",
+ "proxy_randomize_credentials": false
+ },
+ {
+ "name": "onion",
+ "limited": true,
+ "reachable": false,
+ "proxy": "",
+ "proxy_randomize_credentials": false
+ }
+ ],
+ "relayfee": 5000.00000000,
+ "localaddresses": [
+ {
+ "address": "0600:3c03::f03c:91ff:fe89:dfc4",
+ "port": 8333,
+ "score": 4
+ }
+ ],
+ "warnings": ""
}
{% endhighlight %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getpeerinfo.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getpeerinfo.md
index 3a248fe114..5bafe420c4 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getpeerinfo.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getpeerinfo.md
@@ -41,7 +41,7 @@ The `getpeerinfo` RPC {{summary_getPeerInfo}}
- n: "→ →
`addrlocal`"
t: "string"
p: "Optional
(0 or 1)"
- d: "Our IP address and port number according to the remote node. May be incorrect due to error or lying. Many SPV nodes set this to `127.0.0.1:8333`"
+ d: "Our IP address and port number according to the remote node. May be incorrect due to error or lying. Most SPV nodes set this to `127.0.0.1:8333`"
- n: "→ →
`services`"
t: "string (hex)"
@@ -72,11 +72,21 @@ The `getpeerinfo` RPC {{summary_getPeerInfo}}
t: "number (int)"
p: "Required
(exactly 1)"
d: "The Unix epoch time when we connected to this node"
+
+- n: "→ →
`timeoffset`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.12.0*
The time offset in seconds"
- n: "→ →
`pingtime`"
t: "number (real)"
p: "Required
(exactly 1)"
d: "The number of seconds this node took to respond to our last P2P `ping` message"
+
+- n: "→ →
`minping`"
+ t: "number (real)"
+ p: "Optional
(0 or 1)"
+ d: "*Updated in Bitcoin Core 0.13.0*
The minimum observed ping time (if any at all)"
- n: "→ →
`pingwait`"
t: "number (real)"
@@ -138,12 +148,33 @@ The `getpeerinfo` RPC {{summary_getPeerInfo}}
p: "Required
(exactly 1)"
d: "*Added in Bitcoin Core 0.10.0*
Set to `true` if the remote peer has been whitelisted; otherwise, set to `false`. Whitelisted peers will not be banned if their ban score exceeds the maximum (100 by default). By default, peers connecting from localhost are whitelisted"
+- n: "→ →
`bytessent_per_msg`"
+ t: "string :
object"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
Information about total sent bytes aggregated by message type"
+
+- n: "→ → →
Message Type"
+ t: "number (int)"
+ p: "Required
(1 or more)"
+ d: "Total sent bytes aggregated by message type. One field for every used message type"
+
+- n: "→ →
`bytesrecv_per_msg`"
+ t: "string :
object"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
Information about total received bytes aggregated by message type"
+
+- n: "→ → →
Message Type"
+ t: "number (int)"
+ p: "Required
(1 or more)"
+ d: "Total received bytes aggregated by message type. One field for every used message type"
+
+
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
{% highlight bash %}
-bitcoin-cli -testnet getpeerinfo
+bitcoin-cli getpeerinfo
{% endhighlight %}
Result (edited to show only a single entry, with IP addresses changed to
@@ -152,27 +183,46 @@ Result (edited to show only a single entry, with IP addresses changed to
{% highlight json %}
[
{
- "id" : 9,
- "addr" : "192.0.2.113:18333",
- "addrlocal" : "192.0.2.51:18333",
- "services" : "0000000000000002",
- "lastsend" : 1419277992,
- "lastrecv" : 1419277992,
- "bytessent" : 4968,
- "bytesrecv" : 105078,
- "conntime" : 1419265985,
- "pingtime" : 0.05617800,
- "version" : 70001,
- "subver" : "/Satoshi:0.8.6/",
- "inbound" : false,
- "startingheight" : 315280,
- "banscore" : 0,
- "synced_headers" : -1,
- "synced_blocks" : -1,
- "inflight" : [
- ],
- "whitelisted" : false
+ "id": 3,
+ "addr": "192.0.2.113:43132",
+ "addrlocal": "127.0.0.1:8333",
+ "services": "0000000000000000",
+ "relaytxes": true,
+ "lastsend": 1481158534,
+ "lastrecv": 1481158534,
+ "bytessent": 142772,
+ "bytesrecv": 14167,
+ "conntime": 1481158420,
+ "timeoffset": 11,
+ "pingtime": 0.226368,
+ "minping": 0.226368,
+ "version": 70001,
+ "subver": "/Satoshi:0.12.1/",
+ "inbound": true,
+ "startingheight": 0,
+ "banscore": 0,
+ "synced_headers": -1,
+ "synced_blocks": -1,
+ "inflight": [
+ ],
+ "whitelisted": false,
+ "bytessent_per_msg": {
+ "addr": 55,
+ "inv": 12161,
+ "ping": 32,
+ "pong": 1824,
+ "tx": 128549,
+ "verack": 24,
+ "version": 127
+ },
+ "bytesrecv_per_msg": {
+ "getdata": 12161,
+ "ping": 1824,
+ "pong": 32,
+ "verack": 24,
+ "version": 126
}
+ }
]
{% endhighlight %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getrawmempool.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getrawmempool.md
index b602531cfa..fe799f046e 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getrawmempool.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getrawmempool.md
@@ -60,6 +60,11 @@ The `getrawmempool` RPC {{summary_getRawMemPool}}
t: "number (bitcoins)"
p: "Required
(exactly 1)"
d: "The transaction fee paid by the transaction in decimal bitcoins"
+
+- n: "→ →
`modifiedfee`"
+ t: "number (bitcoins)"
+ p: "Required
(exactly 1)"
+ d: "The transaction fee with fee deltas used for mining priority in decimal bitcoins"
- n: "→ →
`time`"
t: "number (int)"
@@ -81,10 +86,40 @@ The `getrawmempool` RPC {{summary_getRawMemPool}}
p: "Required
(exactly 1)"
d: "The current priority of the transaction"
+- n: "→ →
`descendantcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.12.0*
The number of in-mempool descendant transactions (including this one)"
+
+- n: "→ →
`descendantsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.12.0*
The size of in-mempool descendants (including this one)"
+
+- n: "→ →
`descendantfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.12.0*
The modified fees (see `modifiedfee` above) of in-mempool descendants (including this one)"
+
+- n: "→ →
`ancestorcount`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
The number of in-mempool ancestor transactions (including this one)"
+
+- n: "→ →
`ancestorsize`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
The size of in-mempool ancestors (including this one)"
+
+- n: "→ →
`ancestorfees`"
+ t: "number (int)"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
The modified fees (see `modifiedfee` above) of in-mempool ancestors (including this one)"
+
- n: "→ →
`depends`"
t: "array"
p: "Required
(exactly 1)"
- d: "An array holding TXIDs of unconfirmed transactions this transaction depends upon. Those transactions must be part of a block before this transaction can be added to a block, although all transactions may be included in the same block. The array may be empty"
+ d: "An array holding TXIDs of unconfirmed transactions this transaction depends upon (parent transactions). Those transactions must be part of a block before this transaction can be added to a block, although all transactions may be included in the same block. The array may be empty"
- n: "→ → →
Depends TXID"
t: "string"
@@ -93,20 +128,20 @@ The `getrawmempool` RPC {{summary_getRawMemPool}}
{% enditemplate %}
-*Examples from Bitcoin Core 0.10.0*
+*Examples from Bitcoin Core 0.13.1*
The default (`false`):
{% highlight bash %}
-bitcoin-cli -testnet getrawmempool
+bitcoin-cli getrawmempool
{% endhighlight %}
Result:
{% highlight json %}
[
- "2b1f41d6f1837e164d6d6811d3d8dad2e66effbd1058cd9ed7bdbe1cab20ae03",
- "2baa1f49ac9b951fa781c4c95814333a2f3eda71ed3d0245cd76c2829b3ce354"
+ "b104586f229e330caf42c475fd52684e9eb5e2d02f0fcd216d9554c5347b0873",
+ "094f7dcbc7494510d4daeceb2941ed73b1bd011bf527f6c3b7c897fee85c11d4"
]
{% endhighlight %}
@@ -120,22 +155,47 @@ Result:
{% highlight json %}
{
- "2baa1f49ac9b951fa781c4c95814333a2f3eda71ed3d0245cd76c2829b3ce354" : {
- "size" : 191,
- "fee" : 0.00020000,
- "time" : 1398867772,
- "height" : 227310,
- "startingpriority" : 54545454.54545455,
- "currentpriority" : 54545454.54545455,
- "depends" : [
- ]
- }
+ "b104586f229e330caf42c475fd52684e9eb5e2d02f0fcd216d9554c5347b0873": {
+ "size": 485,
+ "fee": 0.00009700,
+ "modifiedfee": 0.00009700,
+ "time": 1479423635,
+ "height": 439431,
+ "startingpriority": 15327081.81818182,
+ "currentpriority": 21536936.36363636,
+ "descendantcount": 1,
+ "descendantsize": 485,
+ "descendantfees": 9700,
+ "ancestorcount": 1,
+ "ancestorsize": 485,
+ "ancestorfees": 9700,
+ "depends": [
+ ]
+ },
+ "094f7dcbc7494510d4daeceb2941ed73b1bd011bf527f6c3b7c897fee85c11d4": {
+ "size": 554,
+ "fee": 0.00005540,
+ "modifiedfee": 0.00005540,
+ "time": 1479423327,
+ "height": 439430,
+ "startingpriority": 85074.91071428571,
+ "currentpriority": 3497174.4375,
+ "descendantcount": 1,
+ "descendantsize": 554,
+ "descendantfees": 5540,
+ "ancestorcount": 1,
+ "ancestorsize": 554,
+ "ancestorfees": 5540,
+ "depends": [
+ ]
+ }
}
{% endhighlight %}
*See also*
* [GetMemPoolInfo][rpc getmempoolinfo]: {{summary_getMemPoolInfo}}
+* [GetMemPoolEntry][rpc getmempoolentry]: {{summary_getMemPoolEntry}}
* [GetTxOutSetInfo][rpc gettxoutsetinfo]: {{summary_getTxOutSetInfo}}
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getreceivedbyaccount.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getreceivedbyaccount.md
index 2d61e85ecc..7af970d4b2 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getreceivedbyaccount.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getreceivedbyaccount.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `getreceivedbyaccount` RPC {{summary_getReceivedByAccount}}
+{{WARNING}} `getreceivedbyaccount` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---the account name*
{% itemplate ntpd1 %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getwork.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getwork.md
index 55c7ddbad3..b8b2965f50 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getwork.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getwork.md
@@ -11,14 +11,12 @@ http://opensource.org/licenses/MIT.
{% autocrossref %}
-The `getwork` RPC {{summary_getWork}}. If you have an older
-version of Bitcoin Core, use the `help` RPC to get help. For example:
-`help getwork`
+The `getwork` RPC {{summary_getWork}} If you have an older
+version of Bitcoin Core, use `help getwork` to get help.
*See also*
* [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}}
* [SubmitBlock][rpc submitblock]: {{summary_submitBlock}}
-* [SetGenerate][rpc setgenerate]: {{summary_setGenerate}}
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/importprunedfunds.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/importprunedfunds.md
new file mode 100644
index 0000000000..033f49e324
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/importprunedfunds.md
@@ -0,0 +1,65 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/importprunedfunds.md" %}
+
+##### ImportPrunedFunds
+{% include helpers/subhead-links.md %}
+
+{% assign summary_importPrunedFunds="imports funds without the need of a rescan. Meant for use with pruned wallets." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+*Requires wallet support.*
+
+The `importprunedfunds` RPC {{summary_importPrunedFunds}} Corresponding address or script must previously be included in wallet.
+The end-user is responsible to import additional transactions that subsequently spend the imported
+outputs or rescan after the point in the blockchain the transaction is included.
+
+*Parameter #1---the raw transaction to import*
+
+{% itemplate ntpd1 %}
+- n: "Raw Transaction"
+ t: "string
(hex)"
+ p: "Required
(exactly 1)"
+ d: "A raw transaction in hex funding an already-existing address in wallet"
+
+{% enditemplate %}
+
+*Parameter #2---the tx out proof that cointains the transaction*
+
+{% itemplate ntpd1 %}
+- n: "TX Out Proof"
+ t: "string
(hex)"
+ p: "Required
(exactly 1)"
+ d: "The hex output from gettxoutproof that contains the transaction"
+
+{% enditemplate %}
+
+*Result---`null` on success*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "null"
+ p: "Required
(exactly 1)"
+ d: "If the funds are added to wallet, JSON `null` will be returned"
+
+{% enditemplate %}
+
+*Example from Bitcoin Core 0.13.1*
+
+{% highlight bash %}
+bitcoin-cli importprunedfunds "txhex" "txoutproof"
+{% endhighlight %}
+
+(Success: no result displayed.)
+
+*See also*
+
+* [ImportPrivKey][rpc importprivkey]: {{summary_importPrivKey}}
+* [RemovePrunedFunds][rpc removeprunedfunds]: {{summary_removePrunedFunds}}
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaccounts.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaccounts.md
index e14bc38266..a9d14a28e4 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaccounts.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaccounts.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `listaccounts` RPC {{summary_listAccounts}}
+{{WARNING}} `listaccounts` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---the minimum number of confirmations a transaction must have*
{{INCLUDE_CONFIRMATIONS_PARAMETER}}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaddressgroupings.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaddressgroupings.md
index f1edcc51c9..635631701f 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaddressgroupings.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listaddressgroupings.md
@@ -48,7 +48,7 @@ The `listaddressgroupings` RPC {{summary_listAddressGroupings}}
- n: "→ → →
Account"
t: "string"
p: "Optional
(0 or 1)"
- d: "The account the address belongs to, if any. This field will not be returned for change addresses. The default account is an empty string (\"\")"
+ d: "*Deprecated: will be removed in a later version of Bitcoin Core*
The account the address belongs to, if any. This field will not be returned for change addresses. The default account is an empty string (\"\")"
{% enditemplate %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaccount.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaccount.md
index 5480dc4099..3a7f5afe63 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaccount.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaccount.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `listreceivedbyaccount` RPC {{summary_listReceivedByAccount}}
+{{WARNING}} `listreceivedbyaccount` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---the minimum number of confirmations a transaction must have to be counted*
{{INCLUDE_CONFIRMATIONS_PARAMETER}}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaddress.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaddress.md
index 4d1b8ad23d..5d33736168 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaddress.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaddress.md
@@ -59,7 +59,7 @@ The `listreceivedbyaddress` RPC {{summary_listReceivedByAddress}}
- n: "→ →
`account`"
t: "string"
p: "Required
(exactly 1)"
- d: "The account the address belongs to; may be the default account, an empty string (\"\")"
+ d: "*Deprecated: will be removed in a later version of Bitcoin Core*
The account the address belongs to. May be the default account, an empty string (\"\")"
- n: "→ →
`amount`"
t: "number (bitcoins)"
@@ -71,7 +71,12 @@ The `listreceivedbyaddress` RPC {{summary_listReceivedByAddress}}
p: "Required
(exactly 1)"
d: "The number of confirmations of the latest transaction to the address. May be `0` for unconfirmed"
-- n: "→ →
TXIDs"
+- n: "→ →
`label`"
+ t: "string"
+ p: "Required
(exactly 1)"
+ d: "The account the address belongs to. May be the default account, an empty string (\"\")"
+
+- n: "→ →
`txids`"
t: "array"
p: "Required
(exactly 1)"
d: "An array of TXIDs belonging to transactions that pay the address"
@@ -83,7 +88,7 @@ The `listreceivedbyaddress` RPC {{summary_listReceivedByAddress}}
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
List addresses with balances confirmed by at least six blocks, including
watch-only addresses:
@@ -101,6 +106,7 @@ Result (edit to show only two entries):
"account" : "test1",
"amount" : 1.99900000,
"confirmations" : 55680,
+ "label" : "test1",
"txids" : [
"4d71a6127796766c39270881c779b6e05183f2bf35589261e9572436356f287f",
"997115d0cf7b83ed332e6c1f2e8c44f803c95ea43490c84ce3e9ede4b2e1605f"
@@ -112,6 +118,7 @@ Result (edit to show only two entries):
"account" : "someone else's address2",
"amount" : 0.00050000,
"confirmations" : 34714,
+ "label" : "someone else's address2",
"txids" : [
"99845fd840ad2cc4d6f93fafb8b072d188821f55d9298772415175c456f3077d"
]
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listsinceblock.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listsinceblock.md
index 891e64b5f9..62639fd63e 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listsinceblock.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listsinceblock.md
@@ -69,7 +69,7 @@ The `listsinceblock` RPC {{summary_listSinceBlock}}
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
Get all transactions since a particular block (including watch-only
transactions) and the header hash of the sixth most recent block.
@@ -99,7 +99,8 @@ Result (edited to show only two payments):
"walletconflicts" : [
],
"time" : 1399294967,
- "timereceived" : 1418924714
+ "timereceived" : 1418924714,
+ "bip125-replaceable": "no"
},
{
"involvesWatchonly" : true,
@@ -116,7 +117,8 @@ Result (edited to show only two payments):
"walletconflicts" : [
],
"time" : 1418695703,
- "timereceived" : 1418925580
+ "timereceived" : 1418925580,
+ "bip125-replaceable": "no"
}
],
"lastblock" : "0000000000984add1a686d513e66d25686572c7276ec3e358a7e3e9f7eb88619"
@@ -128,5 +130,4 @@ Result (edited to show only two payments):
* [ListReceivedByAccount][rpc listreceivedbyaccount]: {{summary_listReceivedByAccount}}
* [ListReceivedByAddress][rpc listreceivedbyaddress]: {{summary_listReceivedByAddress}}
-
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md
index 2270560e40..d2a07259b8 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md
@@ -1,4 +1,4 @@
-{% comment %}
+{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}
@@ -21,7 +21,7 @@ The `listtransactions` RPC {{summary_listTransactions}}
- n: "Account"
t: "string"
p: "Optional
(0 or 1)"
- d: "The name of an account to get transactinos from. Use an empty string (\"\") to get transactions for the default account. Default is `*` to get transactions for all accounts. The account feature is deprecated"
+ d: "*Deprecated: will be removed in a later version of Bitcoin Core*
The name of an account to get transactinos from. Use an empty string (\"\") to get transactions for the default account. Default is `*` to get transactions for all accounts."
{% enditemplate %}
@@ -82,6 +82,11 @@ The `listtransactions` RPC {{summary_listTransactions}}
p: "Required
(exactly 1)"
d: "A negative bitcoin amount if sending payment; a positive bitcoin amount if receiving payment (including coinbases)"
+- n: "→ →
`label`"
+ t: "string"
+ p: "Optional
(0 or 1)"
+ d: "A comment for the address/transaction"
+
- n: "→ →
`vout`"
t: "number (int)"
p: "Optional
(0 or 1)"
@@ -100,7 +105,7 @@ The `listtransactions` RPC {{summary_listTransactions}}
- n: "→ →
`trusted`"
t: "bool"
p: "Optional
(0 or 1)"
- d: "Indicates wether we consider the outputs of this unconfirmed transaction safe to spend. The field is only visible for unconfirmed transactions"
+ d: "Indicates wether we consider the outputs of this unconfirmed transaction safe to spend. Only returned for unconfirmed transactions"
- n: "→ →
`generated`"
t: "bool"
@@ -110,17 +115,17 @@ The `listtransactions` RPC {{summary_listTransactions}}
- n: "→ →
`blockhash`"
t: "string (hex)"
p: "Optional
(0 or 1)"
- d: "Only returned for confirmed transactions. The hash of the block on the local best block chain which includes this transaction, encoded as hex in RPC byte order"
+ d: "The hash of the block on the local best block chain which includes this transaction, encoded as hex in RPC byte order. Only returned for confirmed transactions"
- n: "→ →
`blockindex`"
t: "number (int)"
p: "Optional
(0 or 1)"
- d: "Only returned for confirmed transactions. The block height of the block on the local best block chain which includes this transaction"
+ d: "The block height of the block on the local best block chain which includes this transaction. Only returned for confirmed transactions"
- n: "→ →
`blocktime`"
t: "number (int)"
p: "Optional
(0 or 1)"
- d: "Only returned for confirmed transactions. The block header time (Unix epoch time) of the block on the local best block chain which includes this transaction"
+ d: "The block header time (Unix epoch time) of the block on the local best block chain which includes this transaction. Only returned for confirmed transactions"
- n: "→ →
`txid`"
t: "string (hex)"
@@ -160,28 +165,26 @@ The `listtransactions` RPC {{summary_listTransactions}}
- n: "→ →
`otheraccount`"
t: "string"
p: "Optional
(0 or 1)"
- d: "Only returned by *move* category payments. This is the account the bitcoins were moved from or moved to, as indicated by a negative or positive *amount* field in this payment"
+ d: "This is the account the bitcoins were moved from or moved to, as indicated by a negative or positive *amount* field in this payment. Only returned by *move* category payments"
- n: "→ →
`bip125-replaceable`"
t: "string"
p: "Required
(exactly 1)"
- d: "Indicates if a transaction is replaceable under BIP125:
• `yes` replaceable
• `no` not replaceable
• `unknown` for unconfirmed transactions not in the mempool"
+ d: "*Added in Bitcoin Core 0.12.0*
Indicates if a transaction is replaceable under BIP125:
• `yes` replaceable
• `no` not replaceable
• `unknown` for unconfirmed transactions not in the mempool"
- n: "→ →
`abandoned`"
t: "bool"
- p: "Required
(exactly 1)"
- d: "Indicates if a transaction is was abandoned:
• `yes` if it was abandoned (inputs are respendable)
• `no` if it was not abandoned"
+ p: "Optional
(0 or 1)"
+ d: "*Added in Bitcoin Core 0.12.1*
Indicates if a transaction is was abandoned:
• `true` if it was abandoned (inputs are respendable)
• `false` if it was not abandoned
Only returned by *send* category payments"
{% enditemplate %}
-*Example from Bitcoin Core 0.12.1*
+*Example from Bitcoin Core 0.13.1*
-List the most recent transaction from the account "someone else's
-address2" including watch-only addresses.
+List the most recent transaction from all accounts including watch-only addresses.
{% highlight bash %}
-bitcoin-cli -testnet listtransactions \
- "" 1 0 true
+bitcoin-cli listtransactions "*" 1 0 true
{% endhighlight %}
Result:
@@ -191,15 +194,16 @@ Result:
{
"involvesWatchonly" : true,
"account" : "",
- "address" : "n3GNqMveyvaPvUbH469vDRadqpJMPc84JA",
- "category" : "receive",
- "amount" : 0.00050000,
+ "address" : "1GeDA9rRpqaCdsdkTzGtbajt6jPvn3pg2N",
+ "category" : "send",
+ "amount" : -3.45902877,
"vout" : 0,
- "confirmations" : 34714,
- "blockhash" : "00000000bd0ed80435fc9fe3269da69bb0730ebb454d0a29128a870ea1a37929",
- "blockindex" : 11,
- "blocktime" : 1411051649,
- "txid" : "99845fd840ad2cc4d6f93fafb8b072d188821f55d9298772415175c456f3077d",
+ "fee" : -0.00032890,
+ "confirmations" : 29710,
+ "blockhash" : "0000000000000000008b9cb38cd3105e75af94b3af79d0a59cbe4edb618fb814",
+ "blockindex" : 1705,
+ "blocktime" : 1463173519,
+ "txid" : "9b32d4315ac4c5e0d3a5fb947b9a198d3641698badc820643a7df23081f99695e",
"walletconflicts" : [
],
"time" : 1418695703,
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listunspent.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listunspent.md
index c61415797f..813159dbb5 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listunspent.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listunspent.md
@@ -83,7 +83,7 @@ the *spendable* field in the results described below.
- n: "→ →
`account`"
t: "string"
p: "Optional
(0 or 1)"
- d: "If the address returned belongs to an account, this is the account. Otherwise not returned"
+ d: "*Deprecated: will be removed in a later version of Bitcoin Core*
If the address returned belongs to an account, this is the account. Otherwise not returned"
- n: "→ →
`scriptPubKey`"
t: "string (hex)"
@@ -109,10 +109,15 @@ the *spendable* field in the results described below.
t: "bool"
p: "Required
(exactly 1)"
d: "*Added in Bitcoin Core 0.10.0*
Set to `true` if the private key or keys needed to spend this output are part of the wallet. Set to `false` if not (such as for watch-only addresses)"
+
+- n: "→ →
`solvable`"
+ t: "bool"
+ p: "Required
(exactly 1)"
+ d: "*Added in Bitcoin Core 0.13.0*
Set to `true` if the wallet knows how to spend this output. Set to `false` if the wallet does not know how to spend the output. It is ignored if the private keys are available "
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
Get all outputs confirmed at least 6 times for a particular
address:
@@ -137,7 +142,8 @@ Result:
"scriptPubKey" : "76a9140dfc8bafc8419853b34d5e072ad37d1a5159f58488ac",
"amount" : 0.00010000,
"confirmations" : 6210,
- "spendable" : true
+ "spendable" : true,
+ "sovable" : true
}
]
{% endhighlight %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/move.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/move.md
index 150d2ba2d8..840853cd0b 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/move.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/move.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `move` RPC {{summary_move}}
+{{WARNING}} `move` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
{{WARNING}} it's allowed to move more funds than are in an account,
giving the sending account a negative balance and giving the receiving
account a balance that may exceed the number of bitcoins in the wallet
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/removeprunedfunds.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/removeprunedfunds.md
new file mode 100644
index 0000000000..77f3f0decc
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/removeprunedfunds.md
@@ -0,0 +1,54 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/removeprunedfunds.md" %}
+
+##### RemovePrunedFunds
+{% include helpers/subhead-links.md %}
+
+{% assign summary_removePrunedFunds="deletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+*Requires wallet support.*
+
+The `removeprunedfunds` RPC {{summary_removePrunedFunds}} This will effect wallet balances.
+
+*Parameter #1---the raw transaction to import*
+
+{% itemplate ntpd1 %}
+- n: "TXID"
+ t: "string
(hex)"
+ p: "Required
(exactly 1)"
+ d: "The hex-encoded id of the transaction you are removing"
+
+{% enditemplate %}
+
+*Result---`null` on success*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "null"
+ p: "Required
(exactly 1)"
+ d: "If the funds are removed from the wallet, JSON `null` will be returned"
+
+{% enditemplate %}
+
+*Example from Bitcoin Core 0.13.1*
+
+{% highlight bash %}
+bitcoin-cli removeprunedfunds a8d0c0184dde994a09ec054286f1ce581b\
+ebf46446a512166eae7628734ea0a5
+{% endhighlight %}
+
+(Success: no result displayed.)
+
+*See also*
+
+* [ImportPrivKey][rpc importprivkey]: {{summary_importPrivKey}}
+* [ImportPrunedFunds][rpc importprunedfunds]: {{summary_importPrunedFunds}}
+
+{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendfrom.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendfrom.md
index e91e8eea9e..b92106e30c 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendfrom.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendfrom.md
@@ -16,6 +16,9 @@ unencrypted wallet.*
The `sendfrom` RPC {{summary_sendFrom}}
+{{WARNING}} `sendfrom` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---from account*
{% itemplate ntpd1 %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendmany.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendmany.md
index 743770ac61..cc2aa6245a 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendmany.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/sendmany.md
@@ -22,7 +22,7 @@ The `sendmany` RPC {{summary_sendMany}}
- n: "From Account"
t: "string"
p: "Required
(exactly 1)"
- d: "The name of the account from which the bitcoins should be spent. Use an empty string (\"\") for the default account. Bitcoin Core will ensure the account has sufficient bitcoins to pay the total amount in the *outputs* field described below (but the transaction fee paid is not included in the calculation, so an account can spend a total of its balance plus the transaction fee)"
+ d: "*Deprecated: will be removed in a later version of Bitcoin Core*
The name of the account from which the bitcoins should be spent. Use an empty string (\"\") for the default account. Bitcoin Core will ensure the account has sufficient bitcoins to pay the total amount in the *outputs* field described below (but the transaction fee paid is not included in the calculation, so an account can spend a total of its balance plus the transaction fee)"
{% enditemplate %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setaccount.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setaccount.md
index 26726a776b..1a0c532953 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setaccount.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setaccount.md
@@ -15,6 +15,9 @@ http://opensource.org/licenses/MIT.
The `setaccount` RPC {{summary_setAccount}}
+{{WARNING}} `setaccount` will be removed in a later version of Bitcoin
+Core. Use the RPCs listed in the See Also subsection below instead.
+
*Parameter #1---a bitcoin address*
{% itemplate ntpd1 %}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setgenerate.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setgenerate.md
index 737ce204c6..a77242c464 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setgenerate.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setgenerate.md
@@ -7,102 +7,21 @@ http://opensource.org/licenses/MIT.
##### SetGenerate
{% include helpers/subhead-links.md %}
-{% assign summary_setGenerate="enables or disables hashing to attempt to find the next block." %}
+{% assign summary_setGenerate="was removed in Bitcoin Core 0.13.0." %}
{% autocrossref %}
*Requires wallet support.*
-The `setgenerate` RPC {{summary_setGenerate}}
-
-*Parameter #1---whether to enable or disable generation*
-
-{% itemplate ntpd1 %}
-- n: "Enable/Disable"
- t: "bool"
- p: "Required
(exactly 1)"
- d: "Set to `true` to enable generation; set to `false` to disable generation"
-
-{% enditemplate %}
-
-*Parameter #2 (regular)---the number of processors to use*
-
-{% itemplate ntpd1 %}
-- n: "Processors"
- t: "number (int)"
- p: "Optional
(0 or 1)"
- d: "The number of processors to use. Defaults to `1`. Set to `-1` to use all processors"
-
-{% enditemplate %}
-
-*Parameter #2 (regtest)---the number of blocks to generate*
-
-Note: setgenerate in regtest mode has been removed in Bitcoin Core
-master. See the `generate` RPC for the replacement.
-
-{% itemplate ntpd1 %}
-- n: "Blocks"
- t: "number (int)"
- p: "Optional
(0 or 1)"
- d: "In regtest mode, set to the number of blocks to generate. Defaults to `1`"
-
-{% enditemplate %}
-
-*Result (regular)---generating is enabled*
-
-{% itemplate ntpd1 %}
-- n: "`result`"
- t: "null"
- p: "Required
(exactly 1)"
- d: "Always JSON `null`"
-
-{% enditemplate %}
-
-*Result (regtest)---the generated block header hashes*
-
-{% itemplate ntpd1 %}
-- n: "`result`"
- t: "array/null"
- p: "Required
(exactly 1)"
- d: "An array containing the block header hashes of the generated blocks, or JSON `null` if no blocks were generated"
-
-- n: "→
Header Hashes"
- t: "string (hex)"
- p: "Required
(1 or more)"
- d: "The hashes of the headers of the blocks generated in regtest mode, as hex in RPC byte order"
-
-{% enditemplate %}
-
-*Examples from Bitcoin Core 0.10.0*
-
-Enable generation using two logical processors (on this machine, two
-cores of one physical processor):
-
-{% highlight bash %}
-bitcoin-cli -testnet setgenerate true 2
-{% endhighlight %}
-
-(Success: no result displayed. Process manager shows 200% CPU usage.)
-
-Using regtest mode, generate 2 blocks:
-
-{% highlight bash %}
-bitcoin-cli -regtest setgenerate true 101
-{% endhighlight %}
-
-Result:
-
-{% highlight json %}
-[
- "7e38de938d0dcbb41be63d78a8353e77e9d1b3ef82e0368eda051d4926eef915",
- "61d6e5f1a64d009659f45ef1c614e57f4aa0501708641212be236dc56d726da8"
-]
-{% endhighlight %}
+The `setgenerate` RPC {{summary_setGenerate}} If you have an older
+version of Bitcoin Core, use `help setgenerate` RPC to get help. For testing,
+the generate call can still be used to mine a block, and the `generatetoaddress` RPC
+call has been added to mine to a specific address. This works with wallet disabled.
*See also*
-* [GetGenerate][rpc getgenerate]: {{summary_getGenerate}}
-* [GetHashesPerSec][rpc gethashespersec]: {{summary_getHashesPerSec}}
+* [Generate][rpc generate]: {{summary_generate}}
+* [GenerateToAddress][rpc generatetoaddress]: {{summary_generateToAddress}}
* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}}
* [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessage.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessage.md
index 5e051852b5..a98da7a214 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessage.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessage.md
@@ -46,23 +46,23 @@ The `signmessage` RPC {{summary_signMessage}}
{% enditemplate %}
-*Example from Bitcoin Core 0.10.0*
+*Example from Bitcoin Core 0.13.1*
Sign a the message "Hello, World!" using the following address:
{% highlight bash %}
-bitcoin-cli -testnet signmessage mgnucj8nYqdrPFh2JfZSB1NmUThUGnmsqe \
- 'Hello, World!'
+bitcoin-cli signmessage 17fshh33qUze2yifiJ2sXgijSMzJ2KNEwu "Hello, World!"
{% endhighlight %}
Result:
{% highlight text %}
-IL98ziCmwYi5pL+dqKp4Ux+zCa4hP/xbjHmWh+Mk/lefV/0pWV1p/gQ94jgExSmgH2/+PDcCCrOHAady2IEySSI=
+ILypRih424AWRYXK1goB6mskx99aelWcVCTEKolaW7U4VPnwj6Khf+vJSED7pMtPQd3KnXuqq1JvavrQdPMFFB0=
{% endhighlight %}
*See also*
+* [SignMessageWithPrivKey][rpc signmessagewithprivkey]: {{summary_signMessageWithPrivKey}}
* [VerifyMessage][rpc verifymessage]: {{summary_verifyMessage}}
-{% endautocrossref %}
+{% endautocrossref %}
\ No newline at end of file
diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessagewithprivkey.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessagewithprivkey.md
new file mode 100644
index 0000000000..f2fc23e5e9
--- /dev/null
+++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessagewithprivkey.md
@@ -0,0 +1,68 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+{% assign filename="_includes/devdoc/bitcoin-core/rpcs/rpcs/signmessagewithprivkey.md" %}
+
+##### SignMessageWithPrivKey
+{% include helpers/subhead-links.md %}
+
+{% assign summary_signMessageWithPrivKey="signs a message with a given private key." %}
+
+{% autocrossref %}
+
+*Added in Bitcoin Core 0.13.0*
+
+The `signmessagewithprivkey` RPC {{summary_signMessageWithPrivKey}}
+
+*Parameter #1---the private key to sign with*
+
+{% itemplate ntpd1 %}
+- n: "Privat Key"
+ t: "string (base58)"
+ p: "Required
(exactly 1)"
+ d: "The private key to sign the message with encoded in base58check using wallet import format (WIF)"
+
+{% enditemplate %}
+
+*Parameter #2---the message to sign*
+
+{% itemplate ntpd1 %}
+- n: "Message"
+ t: "string"
+ p: "Required
(exactly 1)"
+ d: "The message to sign"
+
+{% enditemplate %}
+
+*Result---the message signature*
+
+{% itemplate ntpd1 %}
+- n: "`result`"
+ t: "string (base64)"
+ p: "Required
(exactly 1)"
+ d: "The signature of the message, encoded in base64. Note that Bitcoin Core before 0.10.0 creates signatures with random *k* values, so each time you sign the same message, it will create a different signature"
+
+{% enditemplate %}
+
+*Example from Bitcoin Core 0.13.1*
+
+Sign a the message "Hello, World!" using the following private key:
+
+{% highlight bash %}
+bitcoin-cli signmessagewithprivkey 5HpHagT65TZzG1PH3CSu63k8DbpvD\
+8s5ip4nEB3kEsreKamq6aB "Hello, World!"
+{% endhighlight %}
+
+Result:
+
+{% highlight text %}
+G+ZauMFgQExAJRKZSldbAVEaZo4i0p2AVivbFASo50PkUnynAMDUiNMVdXDlpYMWvatxCmYmLn8C9zygPRn3Y1c=
+{% endhighlight %}
+
+*See also*
+
+* [SignMessage][rpc signmessage]: {{summary_signMessage}}
+* [VerifyMessage][rpc verifymessage]: {{summary_verifyMessage}}
+
+{% endautocrossref %}
\ No newline at end of file
diff --git a/_includes/helpers/summaries.md b/_includes/helpers/summaries.md
index dd73398ea9..be2fdefc5e 100644
--- a/_includes/helpers/summaries.md
+++ b/_includes/helpers/summaries.md
@@ -1,20 +1,24 @@
{%comment%}AUTOMATICALLY-GENERATED FILE: DO NOT EDIT THIS FILE
This file is licensed under the terms of its source texts{%endcomment%}
-{% assign summary_abandonTransaction="marks an in-wallet transaction and all its in-wallet descendants as abandoned. This allows their inputs to be respend." %}
+{% assign summary_abandonTransaction="marks an in-wallet transaction and all its in-wallet descendants as abandoned. This allows their inputs to be respent." %}
{% assign summary_addMultiSigAddress="adds a P2SH multisig address to the wallet." %}
{% assign summary_addNode="attempts to add or remove a node from the addnode list, or to try a connection to a node once." %}
+{% assign summary_addWitnessAddress="adds a witness address for a script (with pubkey or redeemscript known)." %}
{% assign summary_backupWallet="safely copies `wallet.dat` to the specified file, which can be a directory or a path with filename." %}
-{% assign summary_clearBanned="Clears list of banned nodes." %}
+{% assign summary_clearBanned="clears list of banned nodes." %}
{% assign summary_createMultiSig="creates a P2SH multi-signature address." %}
{% assign summary_createRawTransaction="creates an unsigned serialized transaction that spends a previous output to a new output with a P2PKH or P2SH address. The transaction is not stored in the wallet or transmitted to the network." %}
{% assign summary_decodeRawTransaction="decodes a serialized transaction hex string into a JSON object describing the transaction." %}
{% assign summary_decodeScript="decodes a hex-encoded P2SH redeem script." %}
+{% assign summary_disconnectnode="immediately disconnects from a specified node." %}
{% assign summary_dumpPrivKey="returns the wallet-import-format (WIP) private key corresponding to an address. (But does not remove it from the wallet.)" %}
{% assign summary_dumpWallet="creates or overwrites a file with all wallet keys in a human-readable format." %}
{% assign summary_encryptWallet="encrypts the wallet with a passphrase. This is only to enable encryption for the first time. After encryption is enabled, you will need to enter the passphrase to use private keys." %}
{% assign summary_estimateFee="estimates the transaction fee per kilobyte that needs to be paid for a transaction to be included within a certain number of blocks." %}
{% assign summary_estimatePriority="estimates the priority that a transaction needs in order to be included within a certain number of blocks as a free high-priority transaction." %}
-{% assign summary_generate="nearly instantly generates blocks (in regtest mode only)" %}
+{% assign summary_fundRawTransaction="adds inputs to a transaction until it has enough in value to meet its out value." %}
+{% assign summary_generate="nearly instantly generates blocks." %}
+{% assign summary_generateToAddress="mines blocks immediately to a specified address." %}
{% assign summary_getAccount="returns the name of the account associated with the given address." %}
{% assign summary_getAccountAddress="returns the current Bitcoin address for receiving payments to this account. If the account doesn't exist, it creates both the account and a new address for receiving payment. Once a payment has been received to an address, future calls to this RPC for the same account will return a different address." %}
{% assign summary_getAddedNodeInfo="returns information about the given added node, or all added nodes (except onetry nodes). Only nodes which have been manually added using the `addnode` RPC will have their information displayed." %}
@@ -30,9 +34,12 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_getChainTips="returns information about the highest-height block (tip) of each local block chain." %}
{% assign summary_getConnectionCount="returns the number of connections to other nodes." %}
{% assign summary_getDifficultly="returns the proof-of-work difficulty as a multiple of the minimum difficulty." %}
-{% assign summary_getGenerate="returns true if the node is set to generate blocks using its CPU." %}
-{% assign summary_getHashesPerSec="was removed in Bitcoin Core master (unreleased). It returned a recent hashes per second performance measurement when the node was generating blocks." %}
+{% assign summary_getGenerate="was removed in Bitcoin Core 0.13.0." %}
+{% assign summary_getHashesPerSec="was removed in Bitcoin Core 0.11.0." %}
{% assign summary_getInfo="prints various information about the node and the network." %}
+{% assign summary_getMemPoolAncestors="returns all in-mempool ancestors for a transaction in the mempool." %}
+{% assign summary_getMemPoolDescendants="returns all in-mempool descendants for a transaction in the mempool." %}
+{% assign summary_getMemPoolEntry="returns mempool data for given transaction (must be in mempool)." %}
{% assign summary_getMemPoolInfo="returns information about the node's current transaction memory pool." %}
{% assign summary_getMiningInfo="returns various mining-related information." %}
{% assign summary_getNetTotals="returns information about network traffic, including bytes in, bytes out, and the current time." %}
@@ -55,6 +62,7 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_help="lists all available public RPC commands, or gets help for the specified RPC. Commands which are unavailable will not be listed, such as wallet RPCs if wallet support is disabled." %}
{% assign summary_importAddress="adds an address or pubkey script to the wallet without the associated private key, allowing you to watch for transactions affecting that address or pubkey script without being able to spend any of its outputs." %}
{% assign summary_importPrivKey="adds a private key to your wallet. The key should be formatted in the wallet import format created by the `dumpprivkey` RPC." %}
+{% assign summary_importPrunedFunds="imports funds without the need of a rescan. Meant for use with pruned wallets." %}
{% assign summary_importWallet="imports private keys from a file in wallet dump file format (see the `dumpwallet` RPC). These keys will be added to the keys currently in the wallet. This call may need to rescan all or parts of the block chain for transactions affecting the newly-added keys, which may take several minutes." %}
{% assign summary_keyPoolRefill="fills the cache of unused pre-generated keys (the keypool)." %}
{% assign summary_listAccounts="lists accounts and their balances." %}
@@ -70,6 +78,7 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_move="moves a specified amount from one account in your wallet to another using an off-block-chain transaction." %}
{% assign summary_ping-rpc="sends a P2P ping message to all connected nodes to measure ping time. Results are provided by the `getpeerinfo` RPC pingtime and pingwait fields as decimal seconds. The P2P `ping` message is handled in a queue with all other commands, so it measures processing backlog, not just network ping." %}
{% assign summary_prioritiseTransaction="adds virtual priority or fee to a transaction, allowing it to be accepted into blocks mined by this node (or miners which use this node) with a lower priority or fee. (It can also remove virtual priority or fee, requiring the transaction have a higher priority or fee to be accepted into a locally-mined block.)" %}
+{% assign summary_removePrunedFunds="deletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds." %}
{% assign summary_restGetBlock-noTxDetails="gets a block with a particular header hash from the local block database either as a JSON object or as a serialized block. The JSON object includes TXIDs for transactions within the block rather than the complete transactions [GET block][rest get block] returns." %}
{% assign summary_restGetBlock="gets a block with a particular header hash from the local block database either as a JSON object or as a serialized block." %}
{% assign summary_restGetTx="gets a hex-encoded serialized transaction or a JSON object describing the transaction. By default, Bitcoin Core only stores complete transaction data for UTXOs and your own transactions, so this method may fail on historic transactions unless you use the non-default `txindex=1` in your Bitcoin Core startup settings." %}
@@ -79,9 +88,10 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_sendToAddress="spends an amount to a given address." %}
{% assign summary_setAccount="puts the specified address in the given account." %}
{% assign summary_setBan="attempts add or remove a IP/Subnet from the banned list." %}
-{% assign summary_setGenerate="enables or disables hashing to attempt to find the next block." %}
+{% assign summary_setGenerate="was removed in Bitcoin Core 0.13.0." %}
{% assign summary_setTxFee="sets the transaction fee per kilobyte paid by transactions created by this wallet." %}
{% assign summary_signMessage="signs a message with the private key of an address." %}
+{% assign summary_signMessageWithPrivKey="signs a message with a given private key." %}
{% assign summary_signRawTransaction="signs a transaction in the serialized transaction format using private keys stored in the wallet or provided in the call." %}
{% assign summary_stop="safely shuts down the Bitcoin Core server." %}
{% assign summary_submitBlock="accepts a block, verifies it is a valid addition to the block chain, and broadcasts it to the network. Extra parameters are ignored by Bitcoin Core but may be used by mining pools or other programs." %}
diff --git a/_includes/helpers/vars.md b/_includes/helpers/vars.md
index 5dd4fd9277..7b054e250e 100644
--- a/_includes/helpers/vars.md
+++ b/_includes/helpers/vars.md
@@ -12,7 +12,7 @@ http://opensource.org/licenses/MIT.
- n: "{{DEPTH}}
`account`"
t: "string"
p: "Required
(exactly 1)"
- d: "The account which the payment was credited to or debited from. May be an empty string (\"\") for the default account"
+ d: "*Deprecated: will be removed in a later version of Bitcoin Core*
The account which the payment was credited to or debited from. May be an empty string (\"\") for the default account"
- n: "{{DEPTH}}
`address`"
t: "string (base58)"
diff --git a/_includes/references.md b/_includes/references.md
index fdf11ebaf5..cf6474cc51 100644
--- a/_includes/references.md
+++ b/_includes/references.md
@@ -69,6 +69,7 @@ http://opensource.org/licenses/MIT.
[rpc abandontransaction]: /en/developer-reference#abandontransaction
[rpc addmultisigaddress]: /en/developer-reference#addmultisigaddress
[rpc addnode]: /en/developer-reference#addnode
+[rpc addwitnessaddress]: /en/developer-reference#addwitnessaddress
[rpc backupwallet]: /en/developer-reference#backupwallet
[rpc clearbanned]: /en/developer-reference#clearbanned
[rpc createmultisig]: /en/developer-reference#createmultisig
@@ -81,7 +82,9 @@ http://opensource.org/licenses/MIT.
[rpc encryptwallet]: /en/developer-reference#encryptwallet
[rpc estimatefee]: /en/developer-reference#estimatefee
[rpc estimatepriority]: /en/developer-reference#estimatepriority
+[rpc fundrawtransaction]: /en/developer-reference#fundrawtransaction
[rpc generate]: /en/developer-reference#generate
+[rpc generatetoaddress]: /en/developer-reference#generatetoaddress
[rpc getaccount]: /en/developer-reference#getaccount
[rpc getaccountaddress]: /en/developer-reference#getaccountaddress
[rpc getaddednodeinfo]: /en/developer-reference#getaddednodeinfo
@@ -100,6 +103,9 @@ http://opensource.org/licenses/MIT.
[rpc getgenerate]: /en/developer-reference#getgenerate
[rpc gethashespersec]: /en/developer-reference#gethashespersec
[rpc getinfo]: /en/developer-reference#getinfo
+[rpc getmempoolancestors]: /en/developer-reference#getmempoolancestors
+[rpc getmempooldescendants]: /en/developer-reference#getmempooldescendants
+[rpc getmempoolentry]: /en/developer-reference#getmempoolentry
[rpc getmempoolinfo]: /en/developer-reference#getmempoolinfo
[rpc getmininginfo]: /en/developer-reference#getmininginfo
[rpc getnettotals]: /en/developer-reference#getnettotals
@@ -122,6 +128,7 @@ http://opensource.org/licenses/MIT.
[rpc help]: /en/developer-reference#help
[rpc importaddress]: /en/developer-reference#importaddress
[rpc importprivkey]: /en/developer-reference#importprivkey
+[rpc importprunedfunds]: /en/developer-reference#importprunedfunds
[rpc importwallet]: /en/developer-reference#importwallet
[rpc keypoolrefill]: /en/developer-reference#keypoolrefill
[rpc listaccounts]: /en/developer-reference#listaccounts
@@ -137,6 +144,7 @@ http://opensource.org/licenses/MIT.
[rpc move]: /en/developer-reference#move
[rpc ping]: /en/developer-reference#ping-rpc
[rpc prioritisetransaction]: /en/developer-reference#prioritisetransaction
+[rpc removeprunedfunds]: /en/developer-reference#removeprunedfunds
[rpc sendfrom]: /en/developer-reference#sendfrom
[rpc sendmany]: /en/developer-reference#sendmany
[rpc sendrawtransaction]: /en/developer-reference#sendrawtransaction
@@ -146,6 +154,7 @@ http://opensource.org/licenses/MIT.
[rpc setgenerate]: /en/developer-reference#setgenerate
[rpc settxfee]: /en/developer-reference#settxfee
[rpc signmessage]: /en/developer-reference#signmessage
+[rpc signmessagewithprivkey]: /en/developer-reference#signmessagewithprivkey
[rpc signrawtransaction]: /en/developer-reference#signrawtransaction
[rpc stop]: /en/developer-reference#stop
[rpc submitblock]: /en/developer-reference#submitblock
diff --git a/en/developer-reference.md b/en/developer-reference.md
index f2212a9fe8..f0a4c285ec 100644
--- a/en/developer-reference.md
+++ b/en/developer-reference.md
@@ -74,6 +74,8 @@ untrusted source.
{% include devdoc/bitcoin-core/rpcs/rpcs/addnode.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/addwitnessaddress.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/backupwallet.md %}
{% include devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md %}
@@ -98,8 +100,12 @@ untrusted source.
{% include devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/fundrawtransaction.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/generate.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/generatetoaddress.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/getaccountaddress.md %}
{% include devdoc/bitcoin-core/rpcs/rpcs/getaccount.md %}
@@ -136,6 +142,12 @@ untrusted source.
{% include devdoc/bitcoin-core/rpcs/rpcs/getinfo.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/getmempoolancestors.md %}
+
+{% include devdoc/bitcoin-core/rpcs/rpcs/getmempooldescendants.md %}
+
+{% include devdoc/bitcoin-core/rpcs/rpcs/getmempoolentry.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/getmempoolinfo.md %}
{% include devdoc/bitcoin-core/rpcs/rpcs/getmininginfo.md %}
@@ -180,6 +192,8 @@ untrusted source.
{% include devdoc/bitcoin-core/rpcs/rpcs/importprivkey.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/importprunedfunds.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/importwallet.md %}
{% include devdoc/bitcoin-core/rpcs/rpcs/keypoolrefill.md %}
@@ -210,6 +224,8 @@ untrusted source.
{% include devdoc/bitcoin-core/rpcs/rpcs/prioritisetransaction.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/removeprunedfunds.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/sendfrom.md %}
{% include devdoc/bitcoin-core/rpcs/rpcs/sendmany.md %}
@@ -228,6 +244,8 @@ untrusted source.
{% include devdoc/bitcoin-core/rpcs/rpcs/signmessage.md %}
+{% include devdoc/bitcoin-core/rpcs/rpcs/signmessagewithprivkey.md %}
+
{% include devdoc/bitcoin-core/rpcs/rpcs/signrawtransaction.md %}
{% include devdoc/bitcoin-core/rpcs/rpcs/stop.md %}