mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-03 04:01:43 +02:00
[wallet] [rpc] introduce 'label' API for wallet
Add label API to wallet RPC. This is one step towards #3816 ("Remove bolt-on account system") although it doesn't actually remove anything yet. These initially mirror the account functions, with the following differences: - These functions aren't DEPRECATED in the help - Help mentions 'label' instead of accounts. In the language used, labels are associated with addresses, instead of addresses associated with labels. (unlike with accounts.) - Labels have no balance - No balances in `listlabels` - `listlabels` has no minconf or watchonly argument - Like in the GUI, labels can be set on any address, not just receiving addreses - Unlike accounts, labels can be deleted. Being unable to delete them is a common annoyance (see #1231). Currently only by reassigning all addresses using `setlabel`, but an explicit call `deletelabel` which assigns all address to the default label may make sense. Thanks to Pierre Rochard for test fixes.
This commit is contained in:
committed by
John Newbery
parent
cf8073f8d1
commit
189e0ef33e
@ -12,6 +12,7 @@ RPCs tested are:
|
||||
- sendfrom (with account arguments)
|
||||
- move (with account arguments)
|
||||
"""
|
||||
from collections import defaultdict
|
||||
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
from test_framework.util import assert_equal
|
||||
@ -78,9 +79,12 @@ class WalletLabelsTest(BitcoinTestFramework):
|
||||
# recognize the label/address associations.
|
||||
labels = [Label(name) for name in ("a", "b", "c", "d", "e")]
|
||||
for label in labels:
|
||||
label.add_receive_address(node.getlabeladdress(label.name))
|
||||
label.add_receive_address(node.getlabeladdress(label=label.name, force=True))
|
||||
label.verify(node)
|
||||
|
||||
# Check all labels are returned by listlabels.
|
||||
assert_equal(node.listlabels(), [label.name for label in labels])
|
||||
|
||||
# Send a transaction to each label, and make sure this forces
|
||||
# getlabeladdress to generate a new receiving address.
|
||||
for label in labels:
|
||||
@ -115,7 +119,7 @@ class WalletLabelsTest(BitcoinTestFramework):
|
||||
|
||||
# Check that setlabel can assign a label to a new unused address.
|
||||
for label in labels:
|
||||
address = node.getlabeladdress("")
|
||||
address = node.getlabeladdress(label="", force=True)
|
||||
node.setlabel(address, label.name)
|
||||
label.add_address(address)
|
||||
label.verify(node)
|
||||
@ -128,6 +132,7 @@ class WalletLabelsTest(BitcoinTestFramework):
|
||||
addresses.append(node.getnewaddress())
|
||||
multisig_address = node.addmultisigaddress(5, addresses, label.name)['address']
|
||||
label.add_address(multisig_address)
|
||||
label.purpose[multisig_address] = "send"
|
||||
label.verify(node)
|
||||
node.sendfrom("", multisig_address, 50)
|
||||
node.generate(101)
|
||||
@ -147,9 +152,7 @@ class WalletLabelsTest(BitcoinTestFramework):
|
||||
change_label(node, labels[2].addresses[0], labels[2], labels[2])
|
||||
|
||||
# Check that setlabel can set the label of an address which is
|
||||
# already the receiving address of the label. It would probably make
|
||||
# sense for this to be a no-op, but right now it resets the receiving
|
||||
# address, causing getlabeladdress to return a brand new address.
|
||||
# already the receiving address of the label. This is a no-op.
|
||||
change_label(node, labels[2].receive_address, labels[2], labels[2])
|
||||
|
||||
class Label:
|
||||
@ -160,6 +163,8 @@ class Label:
|
||||
self.receive_address = None
|
||||
# List of all addresses assigned with this label
|
||||
self.addresses = []
|
||||
# Map of address to address purpose
|
||||
self.purpose = defaultdict(lambda: "receive")
|
||||
|
||||
def add_address(self, address):
|
||||
assert_equal(address not in self.addresses, True)
|
||||
@ -175,8 +180,15 @@ class Label:
|
||||
assert_equal(node.getlabeladdress(self.name), self.receive_address)
|
||||
|
||||
for address in self.addresses:
|
||||
assert_equal(
|
||||
node.getaddressinfo(address)['labels'][0],
|
||||
{"name": self.name,
|
||||
"purpose": self.purpose[address]})
|
||||
assert_equal(node.getaccount(address), self.name)
|
||||
|
||||
assert_equal(
|
||||
node.getaddressesbylabel(self.name),
|
||||
{address: {"purpose": self.purpose[address]} for address in self.addresses})
|
||||
assert_equal(
|
||||
set(node.getaddressesbyaccount(self.name)), set(self.addresses))
|
||||
|
||||
@ -192,7 +204,7 @@ def change_label(node, address, old_label, new_label):
|
||||
# address of a different label should reset the receiving address of
|
||||
# the old label, causing getlabeladdress to return a brand new
|
||||
# address.
|
||||
if address == old_label.receive_address:
|
||||
if old_label.name != new_label.name and address == old_label.receive_address:
|
||||
new_address = node.getlabeladdress(old_label.name)
|
||||
assert_equal(new_address not in old_label.addresses, True)
|
||||
assert_equal(new_address not in new_label.addresses, True)
|
||||
|
Reference in New Issue
Block a user