summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke_github1@dashjr.org>2017-07-14 06:00:00 +0000
committerGitHub <noreply@github.com>2017-07-14 06:00:00 +0000
commit118cfbd44889b03feaa41af851a28d2efe281eb8 (patch)
tree3865ea7190b54fec7287fabf8681f22c8314a408
parent449134f1b50361b8c234d486d05feeaae2103011 (diff)
parent47af438610e1cee6f61490dcfc5f793c78fd3fca (diff)
Merge pull request #557 from zander/FlexTrans
Fix typo
-rw-r--r--bip-0134.mediawiki2
1 files changed, 1 insertions, 1 deletions
diff --git a/bip-0134.mediawiki b/bip-0134.mediawiki
index 9adc8b5..74f6302 100644
--- a/bip-0134.mediawiki
+++ b/bip-0134.mediawiki
@@ -195,7 +195,7 @@ calculation of the merkle tree. This means that changes in signatures
would not be detectable and open an attack vector.
For this reason the merkle tree is extended to include (append) the hash of
-the v4 transactions. The markle tree will continue to have all the
+the v4 transactions. The merkle tree will continue to have all the
transactions' tx-ids but appended to that are the v4 hashes that include the
signatures as well. Specifically the hash is taken over a data-blob that
is built up from: