Browse Source
0.16b224a47a1
Add address_types test (Pieter Wuille)7ee54fd7c
Support downgrading after recovered keypool witness keys (Pieter Wuille)940a21932
SegWit wallet support (Pieter Wuille)f37c64e47
Implicitly know about P2WPKH redeemscripts (Pieter Wuille)57273f2b3
[test] Serialize CTransaction with witness by default (Pieter Wuille)cf2c0b6f5
Support P2WPKH and P2SH-P2WPKH in dumpprivkey (Pieter Wuille)37c03d3e0
Support P2WPKH addresses in create/addmultisig (Pieter Wuille)3eaa003c8
Extend validateaddress information for P2SH-embedded witness (Pieter Wuille)30a27dc5b
Expose method to find key for a single-key destination (Pieter Wuille)985c79552
Improve witness destination types and use them more (Pieter Wuille)cbe197470
[refactor] GetAccount{PubKey,Address} -> GetAccountDestination (Pieter Wuille)0c8ea6380
Abstract out IsSolvable from Witnessifier (Pieter Wuille) Pull request description: This implements a minimum viable implementation of SegWit wallet support, based on top of #11389, and includes part of the functionality from #11089. Two new configuration options are added: * `-addresstype`, with options `legacy`, `p2sh`, and `bech32`. It controls what kind of addresses are produced by `getnewaddress`, `getaccountaddress`, and `createmultisigaddress`. * `-changetype`, with the same options, and by default equal to `-addresstype`, that controls what kind of change is used. All wallet private and public keys can be used for any type of address. Support for address types dependent on different derivation paths will need a major overhaul of how our internal detection of outputs work. I expect that that will happen for a next major version. The above also applies to imported keys, as having a distinction there but not for normal operations is a disaster for testing, and probably for comprehension of users. This has some ugly effects, like needing to associate the provided label to `importprivkey` with each style address for the corresponding key. To deal with witness outputs requiring a corresponding redeemscript in wallet, three approaches are used: * All SegWit addresses created through `getnewaddress` or multisig RPCs explicitly get their redeemscripts added to the wallet file. This means that downgrading after creating a witness address will work, as long as the wallet file is up to date. * All SegWit keys in the wallet get an _implicit_ redeemscript added, without it being written to the file. This means recovery of an old backup will work, as long as you use new software. * All keypool keys that are seen used in transactions explicitly get their redeemscripts added to the wallet files. This means that downgrading after recovering from a backup that includes a witness address will work. These approaches correspond to solutions 3a, 1a, and 5a respectively from https://gist.github.com/sipa/125cfa1615946d0c3f3eec2ad7f250a2. As argued there, there is no full solution for dealing with the case where you both downgrade and restore a backup, so that's also not implemented. `dumpwallet`, `importwallet`, `importmulti`, `signmessage` and `verifymessage` don't work with SegWit addresses yet. They're remaining TODOs, for this PR or a follow-up. Because of that, several tests unexpectedly run with `-addresstype=legacy` for now. Tree-SHA512: d425dbe517c0422061ab8dacdc3a6ae47da071450932ed992c79559d922dff7b2574a31a8c94feccd3761c1dffb6422c50055e6dca8e3cf94a169bc95e39e959
Jonas Schnelli
7 years ago
37 changed files with 730 additions and 181 deletions
@ -0,0 +1,199 @@ |
|||||||
|
#!/usr/bin/env python3 |
||||||
|
# Copyright (c) 2017 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 that the wallet can send and receive using all combinations of address types. |
||||||
|
|
||||||
|
There are 4 nodes-under-test: |
||||||
|
- node0 uses legacy addresses |
||||||
|
- node1 uses p2sh/segwit addresses |
||||||
|
- node2 uses p2sh/segwit addresses and bech32 addresses for change |
||||||
|
- node3 uses bech32 addresses |
||||||
|
|
||||||
|
node4 exists to generate new blocks. |
||||||
|
|
||||||
|
The script is a series of tests, iterating over the 4 nodes. In each iteration |
||||||
|
of the test, one node sends: |
||||||
|
- 10/101th of its balance to itself (using getrawchangeaddress for single key addresses) |
||||||
|
- 20/101th to the next node |
||||||
|
- 30/101th to the node after that |
||||||
|
- 40/101th to the remaining node |
||||||
|
- 1/101th remains as fee+change |
||||||
|
|
||||||
|
Iterate over each node for single key addresses, and then over each node for |
||||||
|
multisig addresses. In a second iteration, the same is done, but with explicit address_type |
||||||
|
parameters passed to getnewaddress and getrawchangeaddress. Node0 and node3 send to p2sh, |
||||||
|
node 1 sends to bech32, and node2 sends to legacy. As every node sends coins after receiving, |
||||||
|
this also verifies that spending coins sent to all these address types works.""" |
||||||
|
|
||||||
|
from decimal import Decimal |
||||||
|
import itertools |
||||||
|
|
||||||
|
from test_framework.test_framework import BitcoinTestFramework |
||||||
|
from test_framework.util import assert_equal, assert_greater_than, connect_nodes_bi, sync_blocks, sync_mempools |
||||||
|
|
||||||
|
class AddressTypeTest(BitcoinTestFramework): |
||||||
|
def set_test_params(self): |
||||||
|
self.num_nodes = 5 |
||||||
|
self.extra_args = [["-addresstype=legacy"], ["-addresstype=p2sh-segwit"], ["-addresstype=p2sh-segwit", "-changetype=bech32"], ["-addresstype=bech32"], []] |
||||||
|
|
||||||
|
def setup_network(self): |
||||||
|
self.setup_nodes() |
||||||
|
|
||||||
|
# Fully mesh-connect nodes for faster mempool sync |
||||||
|
for i, j in itertools.product(range(self.num_nodes), repeat=2): |
||||||
|
if i > j: |
||||||
|
connect_nodes_bi(self.nodes, i, j) |
||||||
|
self.sync_all() |
||||||
|
|
||||||
|
def get_balances(self, confirmed=True): |
||||||
|
"""Return a list of confirmed or unconfirmed balances.""" |
||||||
|
if confirmed: |
||||||
|
return [self.nodes[i].getbalance() for i in range(4)] |
||||||
|
else: |
||||||
|
return [self.nodes[i].getunconfirmedbalance() for i in range(4)] |
||||||
|
|
||||||
|
def test_address(self, node, address, multisig, typ): |
||||||
|
"""Run sanity checks on an address.""" |
||||||
|
info = self.nodes[node].validateaddress(address) |
||||||
|
assert(info['isvalid']) |
||||||
|
if not multisig and typ == 'legacy': |
||||||
|
# P2PKH |
||||||
|
assert(not info['isscript']) |
||||||
|
assert(not info['iswitness']) |
||||||
|
assert('pubkey' in info) |
||||||
|
elif not multisig and typ == 'p2sh-segwit': |
||||||
|
# P2SH-P2WPKH |
||||||
|
assert(info['isscript']) |
||||||
|
assert(not info['iswitness']) |
||||||
|
assert_equal(info['script'], 'witness_v0_keyhash') |
||||||
|
assert('pubkey' in info) |
||||||
|
elif not multisig and typ == 'bech32': |
||||||
|
# P2WPKH |
||||||
|
assert(not info['isscript']) |
||||||
|
assert(info['iswitness']) |
||||||
|
assert_equal(info['witness_version'], 0) |
||||||
|
assert_equal(len(info['witness_program']), 40) |
||||||
|
assert('pubkey' in info) |
||||||
|
elif typ == 'legacy': |
||||||
|
# P2SH-multisig |
||||||
|
assert(info['isscript']) |
||||||
|
assert_equal(info['script'], 'multisig') |
||||||
|
assert(not info['iswitness']) |
||||||
|
assert('pubkeys' in info) |
||||||
|
elif typ == 'p2sh-segwit': |
||||||
|
# P2SH-P2WSH-multisig |
||||||
|
assert(info['isscript']) |
||||||
|
assert_equal(info['script'], 'witness_v0_scripthash') |
||||||
|
assert(not info['iswitness']) |
||||||
|
assert(info['embedded']['isscript']) |
||||||
|
assert_equal(info['embedded']['script'], 'multisig') |
||||||
|
assert(info['embedded']['iswitness']) |
||||||
|
assert_equal(info['embedded']['witness_version'], 0) |
||||||
|
assert_equal(len(info['embedded']['witness_program']), 64) |
||||||
|
assert('pubkeys' in info['embedded']) |
||||||
|
elif typ == 'bech32': |
||||||
|
# P2WSH-multisig |
||||||
|
assert(info['isscript']) |
||||||
|
assert_equal(info['script'], 'multisig') |
||||||
|
assert(info['iswitness']) |
||||||
|
assert_equal(info['witness_version'], 0) |
||||||
|
assert_equal(len(info['witness_program']), 64) |
||||||
|
assert('pubkeys' in info) |
||||||
|
else: |
||||||
|
# Unknown type |
||||||
|
assert(False) |
||||||
|
|
||||||
|
def run_test(self): |
||||||
|
# Mine 101 blocks on node4 to bring nodes out of IBD and make sure that |
||||||
|
# no coinbases are maturing for the nodes-under-test during the test |
||||||
|
self.nodes[4].generate(101) |
||||||
|
sync_blocks(self.nodes) |
||||||
|
|
||||||
|
uncompressed_1 = "0496b538e853519c726a2c91e61ec11600ae1390813a627c66fb8be7947be63c52da7589379515d4e0a604f8141781e62294721166bf621e73a82cbf2342c858ee" |
||||||
|
uncompressed_2 = "047211a824f55b505228e4c3d5194c1fcfaa15a456abdf37f9b9d97a4040afc073dee6c89064984f03385237d92167c13e236446b417ab79a0fcae412ae3316b77" |
||||||
|
compressed_1 = "0296b538e853519c726a2c91e61ec11600ae1390813a627c66fb8be7947be63c52" |
||||||
|
compressed_2 = "037211a824f55b505228e4c3d5194c1fcfaa15a456abdf37f9b9d97a4040afc073" |
||||||
|
|
||||||
|
# addmultisigaddress with at least 1 uncompressed key should return a legacy address. |
||||||
|
for node in range(4): |
||||||
|
self.test_address(node, self.nodes[node].addmultisigaddress(2, [uncompressed_1, uncompressed_2]), True, 'legacy') |
||||||
|
self.test_address(node, self.nodes[node].addmultisigaddress(2, [compressed_1, uncompressed_2]), True, 'legacy') |
||||||
|
self.test_address(node, self.nodes[node].addmultisigaddress(2, [uncompressed_1, compressed_2]), True, 'legacy') |
||||||
|
# addmultisigaddress with all compressed keys should return the appropriate address type (even when the keys are not ours). |
||||||
|
self.test_address(0, self.nodes[0].addmultisigaddress(2, [compressed_1, compressed_2]), True, 'legacy') |
||||||
|
self.test_address(1, self.nodes[1].addmultisigaddress(2, [compressed_1, compressed_2]), True, 'p2sh-segwit') |
||||||
|
self.test_address(2, self.nodes[2].addmultisigaddress(2, [compressed_1, compressed_2]), True, 'p2sh-segwit') |
||||||
|
self.test_address(3, self.nodes[3].addmultisigaddress(2, [compressed_1, compressed_2]), True, 'bech32') |
||||||
|
|
||||||
|
for explicit_type, multisig, from_node in itertools.product([False, True], [False, True], range(4)): |
||||||
|
address_type = None |
||||||
|
if explicit_type and not multisig: |
||||||
|
if from_node == 1: |
||||||
|
address_type = 'bech32' |
||||||
|
elif from_node == 0 or from_node == 3: |
||||||
|
address_type = 'p2sh-segwit' |
||||||
|
else: |
||||||
|
address_type = 'legacy' |
||||||
|
self.log.info("Sending from node {} ({}) with{} multisig using {}".format(from_node, self.extra_args[from_node], "" if multisig else "out", "default" if address_type is None else address_type)) |
||||||
|
old_balances = self.get_balances() |
||||||
|
self.log.debug("Old balances are {}".format(old_balances)) |
||||||
|
to_send = (old_balances[from_node] / 101).quantize(Decimal("0.00000001")) |
||||||
|
sends = {} |
||||||
|
|
||||||
|
self.log.debug("Prepare sends") |
||||||
|
for n, to_node in enumerate(range(from_node, from_node + 4)): |
||||||
|
to_node %= 4 |
||||||
|
change = False |
||||||
|
if not multisig: |
||||||
|
if from_node == to_node: |
||||||
|
# When sending non-multisig to self, use getrawchangeaddress |
||||||
|
address = self.nodes[to_node].getrawchangeaddress(address_type=address_type) |
||||||
|
change = True |
||||||
|
else: |
||||||
|
address = self.nodes[to_node].getnewaddress(address_type=address_type) |
||||||
|
else: |
||||||
|
addr1 = self.nodes[to_node].getnewaddress() |
||||||
|
addr2 = self.nodes[to_node].getnewaddress() |
||||||
|
address = self.nodes[to_node].addmultisigaddress(2, [addr1, addr2]) |
||||||
|
|
||||||
|
# Do some sanity checking on the created address |
||||||
|
if address_type is not None: |
||||||
|
typ = address_type |
||||||
|
elif to_node == 0: |
||||||
|
typ = 'legacy' |
||||||
|
elif to_node == 1 or (to_node == 2 and not change): |
||||||
|
typ = 'p2sh-segwit' |
||||||
|
else: |
||||||
|
typ = 'bech32' |
||||||
|
self.test_address(to_node, address, multisig, typ) |
||||||
|
|
||||||
|
# Output entry |
||||||
|
sends[address] = to_send * 10 * (1 + n) |
||||||
|
|
||||||
|
self.log.debug("Sending: {}".format(sends)) |
||||||
|
self.nodes[from_node].sendmany("", sends) |
||||||
|
sync_mempools(self.nodes) |
||||||
|
|
||||||
|
unconf_balances = self.get_balances(False) |
||||||
|
self.log.debug("Check unconfirmed balances: {}".format(unconf_balances)) |
||||||
|
assert_equal(unconf_balances[from_node], 0) |
||||||
|
for n, to_node in enumerate(range(from_node + 1, from_node + 4)): |
||||||
|
to_node %= 4 |
||||||
|
assert_equal(unconf_balances[to_node], to_send * 10 * (2 + n)) |
||||||
|
|
||||||
|
# node4 collects fee and block subsidy to keep accounting simple |
||||||
|
self.nodes[4].generate(1) |
||||||
|
sync_blocks(self.nodes) |
||||||
|
|
||||||
|
new_balances = self.get_balances() |
||||||
|
self.log.debug("Check new balances: {}".format(new_balances)) |
||||||
|
# We don't know what fee was set, so we can only check bounds on the balance of the sending node |
||||||
|
assert_greater_than(new_balances[from_node], to_send * 10) |
||||||
|
assert_greater_than(to_send * 11, new_balances[from_node]) |
||||||
|
for n, to_node in enumerate(range(from_node + 1, from_node + 4)): |
||||||
|
to_node %= 4 |
||||||
|
assert_equal(new_balances[to_node], old_balances[to_node] + to_send * 10 * (2 + n)) |
||||||
|
|
||||||
|
if __name__ == '__main__': |
||||||
|
AddressTypeTest().main() |
Loading…
Reference in new issue