diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-11-30 16:49:11 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-01-09 15:35:31 -0800 |
| commit | 940a21932ba769ba5829cba713579db84f96d2f8 (patch) | |
| tree | 2f1db2f007ef50255baddae3ef712831ad46ab58 /test/functional/bip68-sequence.py | |
| parent | f37c64e477d679853a4076f2f7888568bb034e90 (diff) | |
| download | bitcoin-940a21932ba769ba5829cba713579db84f96d2f8.tar.xz | |
SegWit wallet support
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`).
Diffstat (limited to 'test/functional/bip68-sequence.py')
| -rwxr-xr-x | test/functional/bip68-sequence.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/bip68-sequence.py b/test/functional/bip68-sequence.py index 5f8f21701f..1460305420 100755 --- a/test/functional/bip68-sequence.py +++ b/test/functional/bip68-sequence.py @@ -362,9 +362,10 @@ class BIP68Test(BitcoinTestFramework): block.vtx.extend([tx1, tx2, tx3]) block.hashMerkleRoot = block.calc_merkle_root() block.rehash() + add_witness_commitment(block) block.solve() - self.nodes[0].submitblock(ToHex(block)) + self.nodes[0].submitblock(bytes_to_hex_str(block.serialize(True))) assert_equal(self.nodes[0].getbestblockhash(), block.hash) def activateCSV(self): |