SegWit wallet support
ClosedPublic
Actions

Authored by deadalnix on May 27 2019, 18:31.

Details

Reviewers

markblundeberg

Group Reviewers

Restricted Project

Commits

rSTAGING7ab304b79261: SegWit wallet support
rABC7ab304b79261: SegWit wallet support

Summary

This introduces two command line flags (-addresstype and -changetype) which control
the type of addresses/outputs created by the GUI and RPCs. Certain RPCs allow
overriding these (getnewaddress and getrawchangeaddress). Supported types
are "legacy" (P2PKH and P2SH-multisig), "p2sh-segwit" (P2SH-P2WPKH and P2SH-P2WSH-multisig),
and "bech32" (P2WPKH and P2WSH-multisig).

A few utility functions are added to the wallet to construct different address type
and to add the necessary entries to the wallet file to be compatible with earlier
versions (see CWallet::LearnRelatedScripts, GetDestinationForKey,
GetAllDestinationsForKey, CWallet::AddAndGetDestinationForScript).

This is a partial backport of Core PR11403 : https://github.com/bitcoin/bitcoin/pull/11403/commits/940a21932ba769ba5829cba713579db84f96d2f8

Because we just have one address type to support, we don't need to add new configuration parameters like in the original code.

Depends on D3129, D3131 and D3132

Test Plan

make check
./test/functional/test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

walletupdate

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 6036
Build 10131: Bitcoin ABC Buildbot (legacy)
Build 10130: arc lint + arc unit

Event Timeline

deadalnix created this revision.May 27 2019, 18:31

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 27 2019, 18:31

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

deadalnix added a child revision: D3134: Support downgrading after recovered keypool witness keys.May 27 2019, 18:39

Harbormaster completed remote builds in B6020: Diff 8934.May 27 2019, 18:46

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Since we only have one type, I'd strongly recommend dropping the address_type support from RPC, and just set output_type = OutputType::LEGACY.

src/interfaces/wallet.h
120 ↗	(On Diff #8934)	hmm this isn't in original PR... got missed in T417 I guess
src/wallet/rpcwallet.cpp
167 ↗	(On Diff #8934)	mentions segwit
276 ↗	(On Diff #8934)	mentions segwit address types
src/wallet/wallet.cpp
933 ↗	(On Diff #8934)	PR changes this to: `dest = GetDestinationForKey(account.vchPubKey, g_address_type);`