Skip to content

Commit 1f83208

Browse files
committed
Replace keyhash with scripthash as appropriate
1 parent 3e05471 commit 1f83208

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

_posts/en/pages/2016-01-18-segwit-wallet-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ The following functions are not required for initial segwit support.
150150

151151
#### Native Pay-to-Witness-Script-Hash (P2WSH)
152152

153-
* Native P2WSH is a <code>scripPubKey</code> of 34 bytes. It starts with a <code>OP_0</code>, followed by a canonical push of the <code>scripthash</code> (i.e. <code>0x0020{32-byte keyhash}</code>)
153+
* Native P2WSH is a <code>scripPubKey</code> of 34 bytes. It starts with a <code>OP_0</code>, followed by a canonical push of the <code>scripthash</code> (i.e. <code>0x0020{32-byte scripthash}</code>)
154154
* Same as P2SH-P2WSH, <code>scripthash</code> is SHA256 of the <code>witnessScript</code>.
155155
* When spending a native P2WSH, the <code>scriptSig</code> MUST be empty, and the witness stack format and signature generating rules are same as P2SH-P2WSH (including the requirement of using compressed public key)
156156
* [Example](http://n.bitcoin.ninja/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)

_posts/ja/pages/2016-01-18-segwit-wallet-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ version: 1
154154

155155
#### Native Pay-to-Witness-Script-Hash (P2WSH) {#native-pay-to-witness-script-hash}
156156

157-
* Native P2WSHは34バイトの<code>scripPubKey</code>です。この<code>scripPubKey</code>は<code>OP_0</code>から始まり、その後に<code>scripthash</code>がプッシュされます。(例:<code>0x0020{32-byte keyhash}</code>)
157+
* Native P2WSHは34バイトの<code>scripPubKey</code>です。この<code>scripPubKey</code>は<code>OP_0</code>から始まり、その後に<code>scripthash</code>がプッシュされます。(例:<code>0x0020{32-byte scripthash}</code>)
158158
* P2SH-P2WSHと同様、<code>scripthash</code>は<code>witnessScript</code>をSHA256した値です。
159159
* Native P2WSHを使用する際は、<code>scriptSig</code>は必ず空で、witnessスタックの形式と署名の生成ルールはP2SH-P2WSHと同じです(圧縮公開鍵を使用する要件含め)。
160160
* [Example](http://n.bitcoin.ninja/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)

0 commit comments

Comments
 (0)