Skip to content

Commit 8b00baf

Browse files
authored
Merge pull request bitcoin#449 from zander/FlexTransUpdates
Fixes to 0134
2 parents c485ddf + 5b66911 commit 8b00baf

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

bip-0134.mediawiki

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ a transaction.
6666
CMF tokens are triplets of name, format (like PositiveInteger) and value.
6767
Names in this scope are defined much like an enumeration where the actual
6868
integer value (id, below) is equally important to the written name.
69-
If any token found that is not covered in the next table will make the
69+
If any token found that is not covered in the next table it will make the
7070
transaction that contains it invalid.
7171

7272
{| class="wikitable"
@@ -81,7 +81,7 @@ transaction that contains it invalid.
8181
|-
8282
|TxInScript || 3 ||ByteArray|| Required ||The 'input' part of the script
8383
|-
84-
|TxOutValue || 4 ||Integer || Required ||Amount of satoshi to transfer
84+
|TxOutValue || 4 ||Integer || Required ||Amount of Satoshis to transfer
8585
|-
8686
|TxOutScript || 5 ||ByteArray|| Required ||The 'output' part of the script
8787
|-
@@ -164,7 +164,7 @@ version it would be placed in the outputs segment.
164164
=== Script v2 ===
165165

166166
The default value of ScriptVersion is number 2, as opposed to the version 1
167-
of script that the is in use today. The version 2 is mostly identical
167+
of script that is in use today. The version 2 is mostly identical
168168
to version one, including upgrades made to it over the years and in the
169169
future. The only exception is that the OP_CHECKSIG is made dramatically
170170
simpler. The input-type for OP_CHECKSIG is now no longer configurable, it is
@@ -184,9 +184,9 @@ modifications to such signatures outside of validating all transactions.
184184

185185
For this reason the merkle tree is extended to include (append) the hash of
186186
the v4 transactions. The markle tree will continue to have all the
187-
transactions' tx-ids but appended to that are the v4 hahes that include the
187+
transactions' tx-ids but appended to that are the v4 hashes that include the
188188
signatures as well. Specifically the hash is taken over a data-blob that
189-
is build up from:
189+
is built up from:
190190

191191
1. the tx-id
192192
2. the CMF-tokens 'TxInScript'
@@ -215,7 +215,7 @@ SPV (simple payment validation) wallets need to be updated to receive or
215215
create the new transaction type.
216216

217217
This BIP introduces a new transaction format without changing or
218-
deprecating the existing one or any of its practices. Therefor it is
218+
deprecating the existing one or any of its practices. Therefore it is
219219
backwards compatible for any existing data or parsing-code.
220220

221221
==Reference Implementation==
@@ -238,7 +238,8 @@ To be determined
238238

239239
Copyright (c) 2016 Tom Zander <[email protected]>
240240

241-
This document is licensed under the Open Publication License v1.0
241+
This document is dual-licensed under the Creative-Commons BY-SA license v4.0
242+
and the Open Publication License v1.0 with the following licence-options:
242243

243244
Distribution of substantively modified versions of this document is prohibited without the explicit permission of the copyright holder.
244245
Distribution of the work or derivative of the work in any standard (paper) book form is prohibited unless prior permission is obtained from the copyright holder.

0 commit comments

Comments
 (0)