Merge pull request bitcoin#1651 from michael1011/46-fix-pubkey

BIP46 clarify witness

Author: murchandamus

bip-0046.mediawiki

@@ -90,7 +90,7 @@ month = 1 + index % 12
 To derive the address from the above calculated public key and timelock, we create a <tt>witness script</tt> which locks the funds until the <tt>timelock</tt>, and then checks the signature of the <tt>derived_key</tt>. The <tt>witness script</tt> is hashed with SHA256 to produce a 32-byte hash value that forms the <tt>witness program</tt> in the output script of the P2WSH address.
 
     witnessScript: <timelock> OP_CHECKLOCKTIMEVERIFY OP_DROP <derived_key> OP_CHECKSIG
-    witness:      <signature> <pubkey>
+    witness:      <signature> <witnessScript>
     scriptSig:    (empty)
     scriptPubKey: 0 <32-byte-hash>
                   (0x0020{32-byte-hash})