From b0c8a4695af76500e4426bc301cc5b25bdcef646 Mon Sep 17 00:00:00 2001 From: thephez Date: Mon, 8 Apr 2019 12:03:33 -0400 Subject: [PATCH] V0.14.0 rpc chainlock param (#115) * RPC - Add chainlock param to getrawtransaction and gettransaction * RPC - Add chainlock param to listtransactions - Also removes unused bip125-replaceable * RPC - Add chainlock param to getblock * RPC - Update getblock - add cbTx * RPC - Update listsinceblock - Example updated with chainlock param - Removed bip125-replaceable param --- .../devdoc/dash-core/rpcs/quick-reference.md | 10 +- .../devdoc/dash-core/rpcs/rpcs/getblock.md | 206 +++++++++++------- .../dash-core/rpcs/rpcs/getrawtransaction.md | 8 +- .../dash-core/rpcs/rpcs/gettransaction.md | 56 ++--- .../dash-core/rpcs/rpcs/listsinceblock.md | 57 +++-- .../dash-core/rpcs/rpcs/listtransactions.md | 51 ++--- _includes/helpers/vars.md | 15 +- _includes/layout/base/rpc-table.html | 10 +- 8 files changed, 227 insertions(+), 186 deletions(-) diff --git a/_includes/devdoc/dash-core/rpcs/quick-reference.md b/_includes/devdoc/dash-core/rpcs/quick-reference.md index fc6a70a6..b02d730f 100644 --- a/_includes/devdoc/dash-core/rpcs/quick-reference.md +++ b/_includes/devdoc/dash-core/rpcs/quick-reference.md @@ -113,7 +113,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core {% autocrossref %} * [GetBestBlockHash][rpc getbestblockhash]: {{summary_getBestBlockHash}} -* [GetBlock][rpc getblock]: {{summary_getBlock}} {{DASH_UPDATED0_13_0}} +* [GetBlock][rpc getblock]: {{summary_getBlock}} {{DASH_UPDATED0_14_0}} * [GetBlockChainInfo][rpc getblockchaininfo]: {{summary_getBlockChainInfo}} {{DASH_UPDATED0_13_0}} {{UPDATED0_12_1}} * [GetBlockCount][rpc getblockcount]: {{summary_getBlockCount}} * [GetBlockHash][rpc getblockhash]: {{summary_getBlockHash}} @@ -239,7 +239,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core * [DecodeRawTransaction][rpc decoderawtransaction]: {{summary_decodeRawTransaction}} {{UPDATED0_13_0}} * [DecodeScript][rpc decodescript]: {{summary_decodeScript}} * [FundRawTransaction][rpc fundrawtransaction]: {{summary_fundRawTransaction}} {{DASH_UPDATED0_12_3}} {{UPDATED0_14_0}} -* [GetRawTransaction][rpc getrawtransaction]: {{summary_getRawTransaction}} {{DASH_UPDATED0_13_0}} {{UPDATED0_14_0}} +* [GetRawTransaction][rpc getrawtransaction]: {{summary_getRawTransaction}} {{DASH_UPDATED0_14_0}} * [SendRawTransaction][rpc sendrawtransaction]: {{summary_sendRawTransaction}} * [SignRawTransaction][rpc signrawtransaction]: {{summary_signRawTransaction}} @@ -286,7 +286,7 @@ default. * [GetRawChangeAddress][rpc getrawchangeaddress]: {{summary_getRawChangeAddress}} * [GetReceivedByAccount][rpc getreceivedbyaccount]: {{summary_getReceivedByAccount}} {{DASH_UPDATED0_13_0}} {{DEPRECATED}} * [GetReceivedByAddress][rpc getreceivedbyaddress]: {{summary_getReceivedByAddress}} {{DASH_UPDATED0_13_0}} -* [GetTransaction][rpc gettransaction]: {{summary_getTransaction}} {{UPDATED0_12_0}} +* [GetTransaction][rpc gettransaction]: {{summary_getTransaction}} {{DASH_UPDATED0_14_0}} * [GetUnconfirmedBalance][rpc getunconfirmedbalance]: {{summary_getUnconfirmedBalance}} * [GetWalletInfo][rpc getwalletinfo]: {{summary_getWalletInfo}} {{DASH_UPDATED0_12_3}} * [ImportAddress][rpc importaddress]: {{summary_importAddress}} @@ -305,8 +305,8 @@ default. * [ListLockUnspent][rpc listlockunspent]: {{summary_listLockUnspent}} * [ListReceivedByAccount][rpc listreceivedbyaccount]: {{summary_listReceivedByAccount}} {{DASH_UPDATED0_13_0}} {{DEPRECATED}} * [ListReceivedByAddress][rpc listreceivedbyaddress]: {{summary_listReceivedByAddress}} {{DASH_UPDATED0_13_0}} -* [ListSinceBlock][rpc listsinceblock]: {{summary_listSinceBlock}} -* [ListTransactions][rpc listtransactions]: {{summary_listTransactions}} {{UPDATED0_12_1}} +* [ListSinceBlock][rpc listsinceblock]: {{summary_listSinceBlock}} {{DASH_UPDATED0_14_0}} +* [ListTransactions][rpc listtransactions]: {{summary_listTransactions}} {{DASH_UPDATED0_14_0}} * [ListUnspent][rpc listunspent]: {{summary_listUnspent}} {{DASH_UPDATED0_12_3}} {{UPDATED0_13_0}} * [LockUnspent][rpc lockunspent]: {{summary_lockUnspent}} * [Move][rpc move]: {{summary_move}} {{DEPRECATED}} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getblock.md b/_includes/devdoc/dash-core/rpcs/rpcs/getblock.md index 7a59b0e6..4ed8b953 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getblock.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getblock.md @@ -3,6 +3,7 @@ This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} {% assign filename="_includes/devdoc/dash-core/rpcs/rpcs/getblock.md" %} + ##### GetBlock {% include helpers/subhead-links.md %} @@ -96,6 +97,26 @@ The `getblock` RPC {{summary_getBlock}} p: "Required
(1 or more)" d: "The TXID of a transaction in this block, encoded as hex in RPC byte order" +- n: "→
`cbTx`" + t: "object" + p: "Required
(exactly 1)" + d: "Coinbase special transaction details" + +- n: "→ →
`version`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "The version of the Coinbase special transaction (CbTx)" + +- n: "→ →
`height`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "The height of this block on its block chain" + +- n: "→ →
`merkleRootMNList`" + t: "string (hex)" + p: "Required
(exactly 1)" + d: "The merkle root for the masternode list" + - n: "→
`time`" t: "number (int)" p: "Required
(exactly 1)" @@ -191,6 +212,26 @@ The `getblock` RPC {{summary_getBlock}} {{INCLUDE_DECODE_RAW_TRANSACTION}} +- n: "→
`cbTx`" + t: "object" + p: "Required
(exactly 1)" + d: "Coinbase special transaction details" + +- n: "→ →
`version`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "The version of the Coinbase special transaction (CbTx)" + +- n: "→ →
`height`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "The height of this block on its block chain" + +- n: "→ →
`merkleRootMNList`" + t: "string (hex)" + p: "Required
(exactly 1)" + d: "The merkle root for the masternode list" + - n: "→
`time`" t: "number (int)" p: "Required
(exactly 1)" @@ -231,61 +272,72 @@ The `getblock` RPC {{summary_getBlock}} p: "Optional
(0 or 1)" d: "The hash of the next block on the best block chain, if known, encoded as hex in RPC byte order" +- n: "
`chainlock`" + t: "bool" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.14.0*

If set to `true`, this transaction is in a block that is locked (not susceptible to a chain re-org)" + {% enditemplate %} -*Example from Dash Core 0.13.0* +*Example from Dash Core 0.14.0* Get a block in raw hex: {% highlight bash %} dash-cli -testnet getblock \ - 00000012e877c56af0b33d79aae888b5cb40b47809b4bee764e8fea7a9033994 \ + 0000000005fdd3a647d4048f183e639310885fab7983b8e7b5079729e065d91f \ 0 {% endhighlight %} Result (wrapped): {% highlight text %} -01000020d2fb795188566bd52deaa8e62de6f59c2833e842f9f6a48cea026689\ -04000000c7274c45e043e5953f2d62a1938818b513d8fd4c9f99c2c1541d1449\ -7f368602c2d8175c417b4d1d0007a96501010000000100000000000000000000\ -00000000000000000000000000000000000000000000ffffffff1202a91a0e2f\ -5032506f6f6c2d74444153482fffffffff0404e65a96010000001976a9144f79\ -c383bc5d3e9d4d81b98f87337cedfa78953688ac40c3609a010000001976a914\ -f627e64c0453f74d879f6e6a37709189af0298da88ac3cdd0504000000001976\ -a914badadfdebaa6d015a0299f23fbc1fcbdd72ba96f88ac0000000000000000\ -2a6a285fb560df18bc5145faa0860841df9daf30dc544c7b0cdb52ff28c06fa3\ -b33924000000000100000000000000 +00000020354559625d75e59743370290291a5c7df72d1af739c3e2ecf7483314\ +000000002ba12397f0ae5884e623004a5e790d7c608fa013630656e61057c0e4\ +fc67a656031f9d5c3e6f221c890a5ec001030005000100000000000000000000\ +00000000000000000000000000000000000000000000ffffffff4c03bc0d0104\ +031f9d5c08fabe6d6d736170747365743a7265737574736574000c870f000008\ +308d3b4900000019730100000000000000580000004f0000000d2f6e6f646553\ +74726174756d2f000000000240230e43000000001976a914cb594917ad4e5849\ +688ec63f29a0f7f3badb5da688ac40230e43000000001976a914477a52436b94\ +4f3e9223ac8404a7717d4176fa5388ac00000000260100bc0d01001dd9fb7d61\ +1bfd2c05c7a508085d2b35053a45fe67c40c0e43be7cd87a7c9b83 {% endhighlight %} Get the same block in JSON: {% highlight bash %} dash-cli -testnet getblock \ - 00000012e877c56af0b33d79aae888b5cb40b47809b4bee764e8fea7a9033994 + 0000000005fdd3a647d4048f183e639310885fab7983b8e7b5079729e065d91f {% endhighlight %} Result: {% highlight json %} { - "hash": "00000012e877c56af0b33d79aae888b5cb40b47809b4bee764e8fea7a9033994", + "hash": "0000000005fdd3a647d4048f183e639310885fab7983b8e7b5079729e065d91f", "confirmations": 1, - "size": 303, - "height": 6825, - "version": 536870913, - "versionHex": "20000001", - "merkleroot": "0286367f49141d54c1c2999f4cfdd813b5188893a1622d3f95e543e0454c27c7", + "size": 315, + "height": 69052, + "version": 536870912, + "versionHex": "20000000", + "merkleroot": "56a667fce4c05710e656066313a08f607c0d795e4a0023e68458aef09723a12b", "tx": [ - "0286367f49141d54c1c2999f4cfdd813b5188893a1622d3f95e543e0454c27c7" + "56a667fce4c05710e656066313a08f607c0d795e4a0023e68458aef09723a12b" ], - "time": 1545066690, - "mediantime": 1545065992, - "nonce": 1705576192, - "bits": "1d4d7b41", - "difficulty": 0.01290611629979371, - "chainwork": "00000000000000000000000000000000000000000000000000000647104aa574", - "previousblockhash": "00000004896602ea8ca4f6f942e833289cf5e62de6a8ea2dd56b56885179fbd2" + "cbTx": { + "version": 1, + "height": 69052, + "merkleRootMNList": "839b7c7ad87cbe430e0cc467fe453a05352b5d0808a5c7052cfd1b617dfbd91d" + }, + "time": 1553800963, + "mediantime": 1553800156, + "nonce": 3227388553, + "bits": "1c226f3e", + "difficulty": 7.434282417439254, + "chainwork": "000000000000000000000000000000000000000000000000003dfe3d34685d0a", + "previousblockhash": "00000000143348f7ece2c339f71a2df77d5c1a299002374397e5755d62594535", + "chainlock": false } {% endhighlight %} @@ -293,97 +345,87 @@ Get the same block in JSON with transaction details: {% highlight bash %} dash-cli -testnet getblock \ - 00000012e877c56af0b33d79aae888b5cb40b47809b4bee764e8fea7a9033994 2 + 0000000005fdd3a647d4048f183e639310885fab7983b8e7b5079729e065d91f 2 {% endhighlight %} Result: {% highlight json %} { - "hash": "00000012e877c56af0b33d79aae888b5cb40b47809b4bee764e8fea7a9033994", + "hash": "0000000005fdd3a647d4048f183e639310885fab7983b8e7b5079729e065d91f", "confirmations": 1, - "size": 303, - "height": 6825, - "version": 536870913, - "versionHex": "20000001", - "merkleroot": "0286367f49141d54c1c2999f4cfdd813b5188893a1622d3f95e543e0454c27c7", + "size": 315, + "height": 69052, + "version": 536870912, + "versionHex": "20000000", + "merkleroot": "56a667fce4c05710e656066313a08f607c0d795e4a0023e68458aef09723a12b", "tx": [ { - "txid": "0286367f49141d54c1c2999f4cfdd813b5188893a1622d3f95e543e0454c27c7", - "size": 222, - "version": 1, - "type": 0, + "txid": "56a667fce4c05710e656066313a08f607c0d795e4a0023e68458aef09723a12b", + "size": 234, + "version": 3, + "type": 5, "locktime": 0, "vin": [ { - "coinbase": "02a91a0e2f5032506f6f6c2d74444153482f", - "sequence": 4294967295 + "coinbase": "03bc0d0104031f9d5c08fabe6d6d736170747365743a7265737574736574000c870f000008308d3b4900000019730100000000000000580000004f0000000d2f6e6f64655374726174756d2f", + "sequence": 0 } ], "vout": [ { - "value": 68.17506820, - "valueSat": 6817506820, + "value": 11.25000000, + "valueSat": 1125000000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 4f79c383bc5d3e9d4d81b98f87337cedfa789536 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9144f79c383bc5d3e9d4d81b98f87337cedfa78953688ac", + "asm": "OP_DUP OP_HASH160 cb594917ad4e5849688ec63f29a0f7f3badb5da6 OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a914cb594917ad4e5849688ec63f29a0f7f3badb5da688ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "yTZg6eePKxbJZyoaC93bVrTUq5vjhFrbst" + "yereyozxENB9jbhqpbg1coE5c39ExqLSaG" ] } }, { - "value": 68.85000000, - "valueSat": 6885000000, + "value": 11.25000000, + "valueSat": 1125000000, "n": 1, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 f627e64c0453f74d879f6e6a37709189af0298da OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914f627e64c0453f74d879f6e6a37709189af0298da88ac", + "asm": "OP_DUP OP_HASH160 477a52436b944f3e9223ac8404a7717d4176fa53 OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a914477a52436b944f3e9223ac8404a7717d4176fa5388ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "yikzsfaaQ2eZ1RpVUpf1EvedzgGdJD17dC" + "ySqPMrmGiB5zu7TYqgdaviEsqixPJc9hNQ" ] } - }, - { - "value": 0.67493180, - "valueSat": 67493180, - "n": 2, - "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 badadfdebaa6d015a0299f23fbc1fcbdd72ba96f OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914badadfdebaa6d015a0299f23fbc1fcbdd72ba96f88ac", - "reqSigs": 1, - "type": "pubkeyhash", - "addresses": [ - "ydMSjYqwv4xTossPJ1xndTxwS1Hho9DmuM" - ] - } - }, - { - "value": 0.00000000, - "valueSat": 0, - "n": 3, - "scriptPubKey": { - "asm": "OP_RETURN 5fb560df18bc5145faa0860841df9daf30dc544c7b0cdb52ff28c06fa3b339240000000001000000", - "hex": "6a285fb560df18bc5145faa0860841df9daf30dc544c7b0cdb52ff28c06fa3b339240000000001000000", - "type": "nulldata" - } } ], - "instantlock": false + "extraPayloadSize": 38, + "extraPayload": "0100bc0d01001dd9fb7d611bfd2c05c7a508085d2b35053a45fe67c40c0e43be7cd87a7c9b83", + "cbTx": { + "version": 1, + "height": 69052, + "merkleRootMNList": "839b7c7ad87cbe430e0cc467fe453a05352b5d0808a5c7052cfd1b617dfbd91d" + }, + "instantlock": false, + "chainlock": false } ], - "time": 1545066690, - "mediantime": 1545065992, - "nonce": 1705576192, - "bits": "1d4d7b41", - "difficulty": 0.01290611629979371, - "chainwork": "00000000000000000000000000000000000000000000000000000647104aa574", - "previousblockhash": "00000004896602ea8ca4f6f942e833289cf5e62de6a8ea2dd56b56885179fbd2" + "cbTx": { + "version": 1, + "height": 69052, + "merkleRootMNList": "839b7c7ad87cbe430e0cc467fe453a05352b5d0808a5c7052cfd1b617dfbd91d" + }, + "time": 1553800963, + "mediantime": 1553800156, + "nonce": 3227388553, + "bits": "1c226f3e", + "difficulty": 7.434282417439254, + "chainwork": "000000000000000000000000000000000000000000000000003dfe3d34685d0a", + "previousblockhash": "00000000143348f7ece2c339f71a2df77d5c1a299002374397e5755d62594535", + "chainlock": false } {% endhighlight %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getrawtransaction.md b/_includes/devdoc/dash-core/rpcs/rpcs/getrawtransaction.md index d7a89f26..be25ede5 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getrawtransaction.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getrawtransaction.md @@ -100,9 +100,14 @@ deprecated. p: "Required
(exactly 1)" d: "If set to `true`, this transaction is locked" +- n: "
`chainlock`" + t: "bool" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.14.0*

If set to `true`, this transaction is in a block that is locked (not susceptible to a chain re-org)" + {% enditemplate %} -*Examples from Dash Core 0.13.0* +*Examples from Dash Core 0.14.0* A classical transaction in serialized transaction format: @@ -188,6 +193,7 @@ Result: "time": 1546278750, "blocktime": 1546278750, "instantlock": true + "chainlock": false } {% endhighlight %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/gettransaction.md b/_includes/devdoc/dash-core/rpcs/rpcs/gettransaction.md index 33f3d723..46382b8e 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/gettransaction.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/gettransaction.md @@ -52,11 +52,6 @@ The `gettransaction` RPC {{summary_getTransaction}} p: "Optional
(0 or 1)" d: "If an outgoing transaction, this is the fee paid by the transaction reported as negative dash" -- n: "→
`instantlock`" - t: "bool" - p: "Required
(exactly 1)" - d: "Current transaction lock state" - {{INCLUDE_F_LIST_TRANSACTIONS_F_FULL}} - n: "→
`DS`" @@ -94,6 +89,11 @@ The `gettransaction` RPC {{summary_getTransaction}} p: "Required
(exactly 1)" d: "A negative dash amount if sending payment; a positive dash amount if receiving payment (including coinbases)" +- n: "→ →
`label`" + t: "string" + p: "Optional
(0 or 1)" + d: "An optional comment for the address/transaction" + - n: "→ →
`vout`" t: "number (int)" p: "Required
(exactly 1)" @@ -116,52 +116,44 @@ The `gettransaction` RPC {{summary_getTransaction}} {% enditemplate %} -*Example from Dash Core 0.12.2* +*Example from Dash Core 0.14.0* {% highlight bash %} dash-cli -testnet gettransaction \ - 345d5f708b047b145f6a40a4e1e36c76648611cd009bd073e607c8ddf47bb797 + c099c882745ad150e9b2a55ef5818683c7ef597e1e5fc20856c67eabc3778ccc {% endhighlight %} Result: - {% highlight json %} { - "amount": 0.00000000, - "fee": -0.00010000, - "confirmations": 20, + "amount": -50.00000000, + "fee": -0.00030000, + "confirmations": 3064, "instantlock": false, + "chainlock": false, + "blockhash": "00000a01007be2912c3123085534b58d341cb5e5980b967e8dcc021089487a1e", + "blockindex": 1, + "blocktime": 1553290594, "trusted": true, - "txid": "345d5f708b047b145f6a40a4e1e36c76648611cd009bd073e607c8ddf47bb797", + "txid": "c099c882745ad150e9b2a55ef5818683c7ef597e1e5fc20856c67eabc3778ccc", "walletconflicts": [ ], - "time": 1511967821, - "timereceived": 1511967821, - "bip125-replaceable": "no", - "DS": "1", + "time": 1553290584, + "timereceived": 1553290584, "details": [ { "account": "", - "address": "ybTSbNqB7nG4ZVbHyati6GbfFz5w7tDnHf", - "category": "privatesend", - "amount": -10.00000000, - "label": "PS", - "vout": 0, - "fee": -0.00010000, + "address": "ycCsAUKsjdmoP4qAXiS1cjYA4ixM48zJWe", + "category": "send", + "amount": -50.00000000, + "label": "Electrum", + "vout": 1, + "fee": -0.00030000, "abandoned": false - }, - { - "account": "PS", - "address": "ybTSbNqB7nG4ZVbHyati6GbfFz5w7tDnHf", - "category": "receive", - "amount": 10.00000000, - "label": "PS", - "vout": 0 } ], - "hex": "010000000156d338508686982770a101c9fd41ce8b2c6ff4eb17dac6b1e7a32dfc5d2ae6e9030000006b4830450221008e8bf68440818d2b2fe8bcc2447d3b455f4e27864dae3f2bc62d2c8d1fdadaad0220390a0810f7f75436a7ebb0bc5c5a5e377b2330e1395f42b5f96d249ac9705ffc012103f4398f7e93dcc64a24191dbae57ef1ccbfcbd867f39a714020e66cf5b10050c4feffffff0100ca9a3b000000001976a914a60d00463c9eed290555e8f719333fc6b21c636088ac89850000" + "hex": "0200000003aac865dba0e98fe32533df6bc3eaac160d04bb02966584fb61fc8d7788e09537010000006a47304402202d537257f23ab42b3e14f2ab533f39bb4586aa1b29a1f833f718a59493c8a601022019c6c156c20e66ef256519592b3c977b64d417c94aea4dca20cf18522a138993012103c67d86944315838aea7ec80d390b5d09b91b62483370d4979da5ccf7a7df77a9feffffff47833a270d2e2bac47bc5dc0df576c3a68b01bedbc89692060ac4113a6f9cb67010000006a4730440220442c19a913b10edc533bf63310f5294d6d91eec0eb9c510a3c6b0f33333f27320220501d5093ecdf603b8af9734e21d5de4710c8500309bfa4acdda243a294442b2c012103c67d86944315838aea7ec80d390b5d09b91b62483370d4979da5ccf7a7df77a9feffffffdcfd2d0fb30d79ffeadab8832e65be2310b67043ff3d74deac9a9cb825acda67000000006b483045022100cae8c025d3bec82903f356a5ec38d78a141447b6562e3aceac901f5fcc6f8567022076407835937514d6690c81c0c3b97f92d2b0ae9749249affaf539ead825692f4012102d6be44ab930ff67f084fbaf47a38b539b8d5da65c010952a972c9e524b6009dffeffffff0204fe2b00000000001976a914e3b0093477c2f629430d0a7b5813fe8b0153b0fd88ac00f2052a010000001976a914ae4365dedb1836ba215b9149602e0787a23376d288ac42010100" } - {% endhighlight %} *See also* diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/listsinceblock.md b/_includes/devdoc/dash-core/rpcs/rpcs/listsinceblock.md index 4fb5018e..66e9a51c 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/listsinceblock.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/listsinceblock.md @@ -71,7 +71,7 @@ The `listsinceblock` RPC {{summary_listSinceBlock}} {% enditemplate %} -*Example from Dash Core 0.12.2* +*Example from Dash Core 0.14.0* Get all transactions since a particular block (including watch-only transactions) and the header hash of the sixth most recent block. @@ -89,48 +89,43 @@ Result (edited to show only two payments): "transactions": [ { "account": "", - "address": "yfCjqf9F7oNGD1sRqta2rNpCXSQ9dknDf5", + "address": "yLXe1NwXmhZbtM6drTXbWFvtEqpsJZkKd2", "category": "send", - "amount": -0.01000010, - "vout": 7, - "fee": 0.05000050, - "confirmations": 95, - "instantlock": false, - "blockhash": "0000000002aa705754c6ab4e15cf2183a1d174e61c080f64eb469c458669144b", - "blockindex": 1, - "blocktime": 1511972930, - "txid": "52e34eec71a4cf95c043b76567f55cec1bc293c444810d454a2d05f2a819b5ed", + "amount": -1.00000000, + "label": "Receiving", + "vout": 0, + "fee": -0.00000226, + "confirmations": 0, + "instantlock": true, + "chainlock": false, + "trusted": true, + "txid": "cc2e6c49faae395d79cfc91d188881e479f544c220e4dfee016889cd53b32645", "walletconflicts": [ ], - "time": 1511972930, - "timereceived": 1511974218, - "bip125-replaceable": "no", + "time": 1554734925, + "timereceived": 1554734925, "abandoned": false }, { "account": "", - "address": "yi2U4Cx2QH33LdNwk2c2oLABWzEZWhYU9k", - "category": "send", - "amount": -0.01000010, - "vout": 8, - "fee": 0.05000050, - "confirmations": 95, - "instantlock": false, - "blockhash": "0000000002aa705754c6ab4e15cf2183a1d174e61c080f64eb469c458669144b", - "blockindex": 1, - "blocktime": 1511972930, - "txid": "52e34eec71a4cf95c043b76567f55cec1bc293c444810d454a2d05f2a819b5ed", + "address": "yLXe1NwXmhZbtM6drTXbWFvtEqpsJZkKd2", + "category": "receive", + "amount": 1.00000000, + "label": "Receiving", + "vout": 0, + "confirmations": 0, + "instantlock": true, + "chainlock": false, + "trusted": true, + "txid": "cc2e6c49faae395d79cfc91d188881e479f544c220e4dfee016889cd53b32645", "walletconflicts": [ ], - "time": 1511972930, - "timereceived": 1511974218, - "bip125-replaceable": "no", - "abandoned": false + "time": 1554734925, + "timereceived": 1554734925 } ], - "lastblock": "000000000dba5583e3fc5c2df06b478e922702f53a1476aac8eb4322f648ccea" + "lastblock": "0000000006be841cd8534b02733d833ad9dd7634ab0897a7e5cd92c574a529a3" } - {% endhighlight %} *See also* diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/listtransactions.md b/_includes/devdoc/dash-core/rpcs/rpcs/listtransactions.md index a2a8aacc..962a9e21 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/listtransactions.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/listtransactions.md @@ -109,16 +109,21 @@ The `listtransactions` RPC {{summary_listTransactions}} p: "Required
(exactly 1)" d: "Current transaction lock state" -- n: "→ →
`trusted`" +- n: "
`chainlock`" t: "bool" - p: "Optional
(0 or 1)" - d: "Indicates whether we consider the outputs of this unconfirmed transaction safe to spend. Only returned for unconfirmed transactions" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.14.0*

If set to `true`, this transaction is in a block that is locked (not susceptible to a chain re-org)" - n: "→ →
`generated`" t: "bool" p: "Optional
(0 or 1)" d: "Set to `true` if the transaction is a coinbase. Not returned for regular transactions or *move* category payments" +- n: "→ →
`trusted`" + t: "bool" + p: "Optional
(0 or 1)" + d: "Indicates whether we consider the outputs of this unconfirmed transaction safe to spend. Only returned for unconfirmed transactions" + - n: "→ →
`blockhash`" t: "string (hex)" p: "Optional
(0 or 1)" @@ -174,11 +179,6 @@ The `listtransactions` RPC {{summary_listTransactions}} p: "Optional
(0 or 1)" d: "This is the account the dash 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: "*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: "Optional
(0 or 1)" @@ -186,7 +186,7 @@ The `listtransactions` RPC {{summary_listTransactions}} {% enditemplate %} -*Example from Dash Core 0.12.2* +*Example from Dash Core 0.14.0* List the most recent transaction from the main account including watch-only addresses. @@ -199,24 +199,25 @@ Result: {% highlight json %} [ { - "account": "MN Setup", - "address": "yY6AmGopsZS31wy1JLHR9P6AC6owFaXwuh", - "category": "immature", - "amount": 11.25000000, - "label": "MN Setup", - "vout": 3, - "confirmations": 20, - "instantlock": false, - "generated": true, - "blockhash": "000000000207e556193e19287d2e554a5f99e1ff7cb19367e8de8ad6bacc494e", - "blockindex": 0, - "blocktime": 1511986957, - "txid": "cd9d44cd87ffb784f9dac384bad7db55324d3f47724eb60e16b3de6a26175936", + "account": "", + "address": "ySGKtDZ3qBHRqk7mHsdofShQkqMcAS7SYJ", + "category": "send", + "amount": -0.50000000, + "label": "", + "vout": 1, + "fee": -0.00040000, + "confirmations": 3, + "instantlock": true, + "chainlock": false, + "blockhash": "000000000327ff7785d799dde99949457ac231ef1d956a2287c2f7bb84d9738c", + "blockindex": 2, + "blocktime": 1553798971, + "txid": "048aae3ad194f5398b67fc7029b26bf50d66ecc7d185fd6d26f8c6ec5a4ed1f9", "walletconflicts": [ ], - "time": 1511986957, - "timereceived": 1511986982, - "bip125-replaceable": "no" + "time": 1553798920, + "timereceived": 1553798920, + "abandoned": false } ] {% endhighlight %} diff --git a/_includes/helpers/vars.md b/_includes/helpers/vars.md index 21d50154..b600331f 100644 --- a/_includes/helpers/vars.md +++ b/_includes/helpers/vars.md @@ -48,6 +48,16 @@ http://opensource.org/licenses/MIT. p: "Required
(exactly 1)" d: "The number of confirmations the transaction has received. Will be `0` for unconfirmed and `-1` for conflicted" +- n: "→
`instantlock`" + t: "bool" + p: "Required
(exactly 1)" + d: "Current transaction lock state" + +- n: "
`chainlock`" + t: "bool" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.14.0*

If set to `true`, this transaction is in a block that is locked (not susceptible to a chain re-org)" + - n: "{{DEPTH}}
`generated`" t: "bool" p: "Optional
(0 or 1)" @@ -93,11 +103,6 @@ http://opensource.org/licenses/MIT. p: "Required
(exactly 1)" d: "A Unix epoch time when the transaction was detected by the local node, or the time of the block on the local best block chain that included the transaction" -- n: "{{DEPTH}}
`bip125-replaceable`" - t: "string" - p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.12.0*

Indicates if a transaction is replaceable under BIP 125:
• `yes` is replaceable
• `no` not replaceable
• `unknown` for unconfirmed transactions not in the mempool" - - n: "{{DEPTH}}
`comment`" t: "string" p: "Optional
(0 or 1)" diff --git a/_includes/layout/base/rpc-table.html b/_includes/layout/base/rpc-table.html index b4cc5946..383c7f34 100644 --- a/_includes/layout/base/rpc-table.html +++ b/_includes/layout/base/rpc-table.html @@ -71,7 +71,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Blockchain GetBlock Y - Updated in 0.13.0.0 + Updated in 0.14.0.0 Blockchain @@ -467,7 +467,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Rawtransactions GetRawTransaction Y - Updated in 0.13.0.0 + Updated in 0.14.0.0 Rawtransactions @@ -653,7 +653,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet GetTransaction Y - + Updated in 0.14.0 Wallet @@ -767,13 +767,13 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet ListSinceBlock Y - + Updated in 0.14.0 Wallet ListTransactions Y - + Updated in 0.14.0 Wallet