Permalink
Browse files

spec: add ASICBOOST mitigation

  • Loading branch information...
indutny committed Apr 6, 2017
1 parent 66301e3 commit 5331eeed1880ecc43a250313415e0d0b02c56bab
Showing with 2 additions and 2 deletions.
  1. +2 −2 spec.md
View
@@ -70,8 +70,8 @@ OP_RETURN 0x24 0xaa21a9ef[32-byte-merkle-root]
The commitment serialization and discovery rules follows the same rules defined
in BIP141.
-The merkle root is to be calculated as a merkle tree with all extension block
-txids and wtxids as the leaves.
+The merkle root is to be calculated as a merkle tree with all extension and
+canonical block txids and wtxids as the leaves.
Note that canonical blocks containing entering outputs MUST contain an
extension block commitment (all zeroes if nothing is present in the extension

0 comments on commit 5331eee

Please sign in to comment.