diff options
author | Luke-Jr <luke_github1@dashjr.org> | 2016-01-25 18:07:57 +0000 |
---|---|---|
committer | Luke-Jr <luke_github1@dashjr.org> | 2016-01-25 18:07:57 +0000 |
commit | aef655ecadaaa0ec63e872867c44a9b3a55c81c8 (patch) | |
tree | c3d79a76f5858554076631054cf0420188c1cc16 /bip-0141.mediawiki | |
parent | 26a1a8fc20b51ee9be1d86f3f0e13b7fa53e20d7 (diff) | |
parent | 6a315c023f13d83c58aab98cf8668d74cf7566c7 (diff) |
Merge pull request #302 from jl2012/patch-9
BIP141 Non-upgraded wallet description
Diffstat (limited to 'bip-0141.mediawiki')
-rw-r--r-- | bip-0141.mediawiki | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bip-0141.mediawiki b/bip-0141.mediawiki index 7114ddd..b62d54d 100644 --- a/bip-0141.mediawiki +++ b/bip-0141.mediawiki @@ -239,14 +239,13 @@ As a soft fork, older software will continue to operate without modification. N '''What a non-upgraded wallet can do''' * Receiving bitcoin from non-upgraded and upgraded wallets -* Sending bitcoin to non-upgraded wallets -* Sending bitcoin to upgraded wallets using a P2SH address (less efficient) -* Sending bitcoin to upgraded wallets using a native witness program (more efficient) through [https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki BIP70] payment protocol +* Sending bitcoin to non-upgraded and upgraded wallets with traditional P2PKH address (without any benefit of segregated witness) +* Sending bitcoin to upgraded wallets using a P2SH address +* Sending bitcoin to upgraded wallets using a native witness program through [https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki BIP70] payment protocol '''What a non-upgraded wallet cannot do''' * Validating segregated witness transaction. It assumes such a transaction is always valid -* Sending bitcoin to upgraded wallets using a native witness program if BIP70 is not supported == Deployment == @@ -281,7 +280,6 @@ https://github.com/sipa/bitcoin/commits/segwit == References == *[[bip-0016.mediawiki|BIP16 Pay to Script Hash]] -*[[bip-0142.mediawiki|BIP142 Address Formats for Segregated Witness]] *[[bip-0143.mediawiki|BIP143 Transaction Signature Verification for Version 0 Witness Program]] *[[bip-0144.mediawiki|BIP144 Segregated Witness (Peer Services)]] |