mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
99a8b60393
2e5f7def22e1b212fbd69e9147145d9d1f408aaf wallet, rpc: update listdescriptors response format (Ivan Metlushko) Pull request description: Update `listdescriptors` response format according to [RPC interface guidelines](https://github.com/bitcoin/bitcoin/blob/master/doc/developer-notes.md#rpc-interface-guidelines). This is a follow up for #20226 **Before:** ``` Result: [ (json array) Response is an array of descriptor objects { (json object) "desc" : "str", (string) Descriptor string representation "timestamp" : n, (numeric) The creation time of the descriptor "active" : true|false, (boolean) Activeness flag "internal" : true|false, (boolean, optional) Whether this is internal or external descriptor; defined only for active descriptors "range" : [ (json array, optional) Defined only for ranged descriptors n, (numeric) Range start inclusive n (numeric) Range end inclusive ], "next" : n (numeric, optional) The next index to generate addresses from; defined only for ranged descriptors }, ... ] ``` **After:** ``` Result: { (json object) "wallet_name" : "str", (string) Name of wallet this operation was performed on "descriptors" : [ (json array) Array of descriptor objects { (json object) "desc" : "str", (string) Descriptor string representation "timestamp" : n, (numeric) The creation time of the descriptor "active" : true|false, (boolean) Activeness flag "internal" : true|false, (boolean, optional) Whether this is internal or external descriptor; defined only for active descriptors "range" : [ (json array, optional) Defined only for ranged descriptors n, (numeric) Range start inclusive n (numeric) Range end inclusive ], "next" : n (numeric, optional) The next index to generate addresses from; defined only for ranged descriptors }, ... ] } ``` ACKs for top commit: achow101: re-ACK 2e5f7def22e1b212fbd69e9147145d9d1f408aaf meshcollider: utACK 2e5f7def22e1b212fbd69e9147145d9d1f408aaf jonatack: re-ACK 2e5f7def22e1b212fbd69e9147145d9d1f408aaf Tree-SHA512: 49bf73e46e2a61003ce594a4bfc506eb9592ccb799c2909c43a1a527490a4b4009f78dc09f3d47b4e945d3d7bb3cd2632cf48c5ace5feed5066158cc010dddc1
96 lines
3.8 KiB
Python
Executable File
96 lines
3.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2014-2021 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""Test the listdescriptors RPC."""
|
|
|
|
from test_framework.descriptors import (
|
|
descsum_create
|
|
)
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
assert_raises_rpc_error,
|
|
)
|
|
|
|
|
|
class ListDescriptorsTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 1
|
|
|
|
def skip_test_if_missing_module(self):
|
|
self.skip_if_no_wallet()
|
|
self.skip_if_no_sqlite()
|
|
|
|
# do not create any wallet by default
|
|
def init_wallet(self, i):
|
|
return
|
|
|
|
def run_test(self):
|
|
node = self.nodes[0]
|
|
assert_raises_rpc_error(-18, 'No wallet is loaded.', node.listdescriptors)
|
|
|
|
if self.is_bdb_compiled():
|
|
self.log.info('Test that the command is not available for legacy wallets.')
|
|
node.createwallet(wallet_name='w1', descriptors=False)
|
|
assert_raises_rpc_error(-4, 'listdescriptors is not available for non-descriptor wallets', node.listdescriptors)
|
|
|
|
self.log.info('Test the command for empty descriptors wallet.')
|
|
node.createwallet(wallet_name='w2', blank=True, descriptors=True)
|
|
assert_equal(0, len(node.get_wallet_rpc('w2').listdescriptors()['descriptors']))
|
|
|
|
self.log.info('Test the command for a default descriptors wallet.')
|
|
node.createwallet(wallet_name='w3', descriptors=True)
|
|
result = node.get_wallet_rpc('w3').listdescriptors()
|
|
assert_equal("w3", result['wallet_name'])
|
|
assert_equal(2, len(result['descriptors']))
|
|
assert_equal(2, len([d for d in result['descriptors'] if d['active']]))
|
|
assert_equal(1, len([d for d in result['descriptors'] if d['internal']]))
|
|
for item in result['descriptors']:
|
|
assert item['desc'] != ''
|
|
assert item['next'] == 0
|
|
assert item['range'] == [0, 0]
|
|
assert item['timestamp'] is not None
|
|
|
|
self.log.info('Test descriptors with hardened derivations are listed in importable form.')
|
|
xprv = 'tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg'
|
|
xpub_acc = 'tpubDCMVLhErorrAGfApiJSJzEKwqeaf2z3NrkVMxgYQjZLzMjXMBeRw2muGNYbvaekAE8rUFLftyEar4LdrG2wXyyTJQZ26zptmeTEjPTaATts'
|
|
hardened_path = '/84\'/1\'/0\''
|
|
wallet = node.get_wallet_rpc('w2')
|
|
wallet.importdescriptors([{
|
|
'desc': descsum_create('pkh(' + xprv + hardened_path + '/0/*)'),
|
|
'timestamp': 1296688602,
|
|
}])
|
|
expected = {
|
|
'wallet_name': 'w2',
|
|
'descriptors': [
|
|
{'desc': descsum_create('pkh([80002067' + hardened_path + ']' + xpub_acc + '/0/*)'),
|
|
'timestamp': 1296688602,
|
|
'active': False,
|
|
'range': [0, 0],
|
|
'next': 0},
|
|
],
|
|
}
|
|
assert_equal(expected, wallet.listdescriptors())
|
|
|
|
self.log.info('Test non-active non-range combo descriptor')
|
|
node.createwallet(wallet_name='w4', blank=True, descriptors=True)
|
|
wallet = node.get_wallet_rpc('w4')
|
|
wallet.importdescriptors([{
|
|
'desc': descsum_create('combo(' + node.get_deterministic_priv_key().key + ')'),
|
|
'timestamp': 1296688602,
|
|
}])
|
|
expected = {
|
|
'wallet_name': 'w4',
|
|
'descriptors': [
|
|
{'active': False,
|
|
'desc': 'combo(038af19f35924e37ad7c3c8045d1e19b9b90b7310e08b892e620c253a102fe49f0)#2j2j0825',
|
|
'timestamp': 1296688602},
|
|
]
|
|
}
|
|
assert_equal(expected, wallet.listdescriptors())
|
|
|
|
|
|
if __name__ == '__main__':
|
|
ListDescriptorsTest().main()
|