Skip to content

Commit e8515fd

Browse files
committed
Merge #693: Fix segwit example links
67d56c0 Fix segwit example links (nicolas.dorier) Pull request description: Fix #692 I will eventually solve the certificate issue on the real website, but in any case `blockchainprogramming.azurewebsites.net` should be more stable, as the site is actually hosted there. ACKs for top commit: kanzure: ACK 67d56c0 problem fixed Sjors: ACK 67d56c0 Tree-SHA512: 5195926bd542670d199ffd57153fb7546ea6def6a1cd35df9f4db67b4b0447f1a3c25fabf3977b097bba4eade260d40584c114a7fcf2c1f10da0e2ea561d7609
2 parents 09fc4e5 + 67d56c0 commit e8515fd

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ A wallet MUST implement all the features in this section, in order to be conside
6969
* There is a new signature generation algorithm described in [BIP143][] for segwit scripts. Developers should follow the instructions carefully, and make use of the P2SH-P2WPKH example in [BIP143](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki#P2SHP2WPKH) to make sure they are able to reproduce the <code>sighash</code>.
7070
* The [BIP143][] signature generating algorithm covers the value of the input being spent, which simplifies the design of air-gapped light-weight wallets and hardware wallets.
7171
* Please note that for a P2SH-P2WPKH, the <code>scriptCode</code> is always 26 bytes including the leading size byte, as <code>0x1976a914{20-byte keyhash}88ac</code>, NOT the <code>redeemScript</code> nor <code>scriptPubKey</code>
72-
* [Example](http://n.bitcoin.ninja/checktx?txid=8139979112e894a14f8370438a471d23984061ff83a9eba0bc7a34433327ec21)
72+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=8139979112e894a14f8370438a471d23984061ff83a9eba0bc7a34433327ec21)
7373

7474
#### Network Services (optional)
7575

@@ -135,7 +135,7 @@ If a wallet supports script types other than just single signature, such as mult
135135
* For any unusual scripts containing OP_CODESEPARATOR, please refer to [BIP143][] for the exact semantics
136136
* Any witness stack items before the <code>witnessScript</code> are used as the input stack for script evaluation. The input stack is not interpreted as script. For example, there is no need to use a <code>0x4c</code> (OP_PUSHDATA1) to "push" a big item.
137137
* To verify the correctness of signature generation and stack serialization, please always test against the examples in [BIP143][]
138-
* [Example](http://n.bitcoin.ninja/checktx?txid=954f43dbb30ad8024981c07d1f5eb6c9fd461e2cf1760dd1283f052af746fc88)
138+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=954f43dbb30ad8024981c07d1f5eb6c9fd461e2cf1760dd1283f052af746fc88)
139139

140140
### Segwit native addresses (optional) {#advanced-designs}
141141

@@ -146,14 +146,14 @@ The following functions are not required for initial segwit support.
146146
* Native P2WPKH is a <code>scriptPubKey</code> of 22 bytes. It starts with a <code>OP_0</code>, followed by a canonical push of the <code>keyhash</code> (i.e. <code>0x0014{20-byte keyhash}</code>)
147147
* Same as P2SH-P2WPKH, <code>keyhash</code> is RIPEMD160(SHA256) of a compressed public key.
148148
* When spending a native P2WPKH, the <code>scriptSig</code> MUST be empty, and the witness stack format and signature generating rules are same as P2SH-P2WPKH (including the requirement of using compressed public key)
149-
* [Example](http://n.bitcoin.ninja/checktx?txid=d869f854e1f8788bcff294cc83b280942a8c728de71eb709a2c29d10bfe21b7c)
149+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=d869f854e1f8788bcff294cc83b280942a8c728de71eb709a2c29d10bfe21b7c)
150150

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

153153
* Native P2WSH is a <code>scriptPubKey</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)
156-
* [Example](http://n.bitcoin.ninja/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)
156+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)
157157

158158
#### Why and How to Use Native (Bech32) P2WPKH and P2WSH?
159159

@@ -167,7 +167,7 @@ The following functions are not required for initial segwit support.
167167

168168
### Scripts and Transactions Examples
169169

170-
* [Examples of different witness transaction types and transaction validity checking tool](http://n.bitcoin.ninja/checktx)
170+
* [Examples of different witness transaction types and transaction validity checking tool](https://blockchainprogramming.azurewebsites.net/checktx)
171171
* [BIP141][]
172172
* [BIP143][]
173173
* [BIP173][]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ version: 1
7070
* segwit scriptのための新しい署名生成アルゴリズムが[BIP143][]に定義されています。開発者は注意深くその指示に従い、[BIP143](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki#P2SHP2WPKH)のexampleを参考に<code>sighash</code>を再現できるか確認する必要があります。
7171
* [BIP143][]の署名生成アルゴリズムは、使用される入力のコインの量をカバーしており、軽量ウォレットやハードウェアウォレットの設計のエアギャップを簡素化します。
7272
* P2SH-P2WPKHの場合、<code>scriptCode</code>は先頭のバイトを含めて常に26バイトで、<code>0x1976a914{20-byte keyhash}88ac</code>となります。<code>redeemScript</code>でも<code>scriptPubKey</code>でもないので注意してください。
73-
* [Example](http://n.bitcoin.ninja/checktx?txid=8139979112e894a14f8370438a471d23984061ff83a9eba0bc7a34433327ec21)
73+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=8139979112e894a14f8370438a471d23984061ff83a9eba0bc7a34433327ec21)
7474

7575
#### ネットワークサービス(オプション) {#network-services}
7676

@@ -139,7 +139,7 @@ version: 1
139139
* あまり一般的ではありませんがOP_CODESEPARATORを含むスクリプトについては、[BIP143][]を参照ください。
140140
* <code>witnessScript</code>より前のwitnessスタックアイテムはスクリプトを評価する際の入力スタックとして使われます。入力スタックはスクリプトとしては解釈されません。そのため、例えば大きなデータをプッシュするのに<code>0x4c</code> (OP_PUSHDATA1) を使う必要はありません。
141141
* 署名の生成とスタック上のシリアライズされた署名が正しいか検証するには、[BIP143][]のexampleを参考にテストしてください。
142-
* [Example](http://n.bitcoin.ninja/checktx?txid=954f43dbb30ad8024981c07d1f5eb6c9fd461e2cf1760dd1283f052af746fc88)
142+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=954f43dbb30ad8024981c07d1f5eb6c9fd461e2cf1760dd1283f052af746fc88)
143143

144144
### 高度な設計 {#advanced-designs}
145145

@@ -150,14 +150,14 @@ version: 1
150150
* Native P2WPKHは22バイトの<code>scriptPubKey</code>です。この<code>scriptPubKey</code>は<code>OP_0</code>で始まり、その後に<code>keyhash</code>がプッシュされます。(例:<code>0x0014{20-byte keyhash}</code>)
151151
* P2SH-P2WPKHと同様、<code>keyhash</code>は圧縮公開鍵をRIPEMD160(SHA256)した値です。
152152
* Native P2WPKHを使用する際は、<code>scriptSig</code>は必ず空で、witnessスタックの形式と署名の生成ルールはP2SH-P2WPKHと同じです(圧縮公開鍵を使用する要件含め)。
153-
* [Example](http://n.bitcoin.ninja/checktx?txid=d869f854e1f8788bcff294cc83b280942a8c728de71eb709a2c29d10bfe21b7c)
153+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=d869f854e1f8788bcff294cc83b280942a8c728de71eb709a2c29d10bfe21b7c)
154154

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

157157
* Native P2WSHは34バイトの<code>scriptPubKey</code>です。この<code>scriptPubKey</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と同じです(圧縮公開鍵を使用する要件含め)。
160-
* [Example](http://n.bitcoin.ninja/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)
160+
* [Example](https://blockchainprogramming.azurewebsites.net/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)
161161

162162
#### Native P2WPKHやP2WSHはどうやって使うのか? {#why-and-how-to-use-native-p2wpkh-and-p2wsh}
163163

@@ -169,7 +169,7 @@ version: 1
169169

170170
### スクリプトとトランザクションの例 {#scripts-and-transactions-example}
171171

172-
* [Examples of different witness transaction types and transaction validity checking tool](http://n.bitcoin.ninja/checktx)
172+
* [Examples of different witness transaction types and transaction validity checking tool](https://blockchainprogramming.azurewebsites.net/checktx)
173173
* [BIP141][]
174174
* [BIP143][]
175175
* [Script tests](https://github.com/bitcoin/bitcoin/blob/master/src/test/data/script_tests.json)

0 commit comments

Comments
 (0)