From 161b39fa687d4716cd54953e840511ebba45899d Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 30 Mar 2016 22:42:42 +0000
Subject: BIP 145: Update for BIP 9

---
 bip-0145.mediawiki | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'bip-0145.mediawiki')

diff --git a/bip-0145.mediawiki b/bip-0145.mediawiki
index 712e422..6c2a859 100644
--- a/bip-0145.mediawiki
+++ b/bip-0145.mediawiki
@@ -15,7 +15,7 @@ This BIP describes modifications to the getblocktemplate JSON-RPC call ([[bip-00
 
 ===Block Template===
 
-The template Object is revised to include these keys:
+The template Object is revised to include a new key:
 
 {| class="wikitable"
 !colspan=4| template
@@ -23,8 +23,6 @@ The template Object is revised to include these keys:
 ! Key !! Required !! Type !! Description
 |-
 | costlimit || {{No}} || Number || total cost allowed in blocks
-|-
-| version || {{Yes}} || Number || block version; clients MUST understand the implications of the version they use (eg, comply with [[bip-0141.mediawiki|BIP 141]] for version 5)
 |}
 
 ====Transactions Object Format====
@@ -43,11 +41,11 @@ The Objects listed in the response's "transactions" key is revised to include th
 | hash || String || reversed hash of complete transaction (with witness data included) encoded in hexadecimal
 |}
 
-Transactions with witness data may only be included if the template's block version is at least 5.
+Transactions with witness data may only be included if the template's "rulesenforced" list (see [[bip-0009.mediawiki#getblocktemplate changes|BIP 9]]) includes "segwit".
 
 ===Sigops===
 
-For version 5 blocks, the "sigoplimit" and "sigops" keys must use the new values as calculated in [[bip-0141.mediawiki#Sigops|BIP 141]].
+For blocks with segwit enforcement, the "sigoplimit" and "sigops" keys must use the new values as calculated in [[bip-0141.mediawiki#Sigops|BIP 141]].
 
 ===Block Assembly with Witness Transactions===
 
@@ -89,6 +87,7 @@ Why shouldn't the server simply add the commitment upfront in the "coinbasetxn",
 * [https://github.com/bitcoin/bitcoin/pull/7404/files Bitcoin Core]
 
 ==See Also==
+* [[bip-0009.mediawiki|BIP 9: Version bits with timeout and delay]]
 * [[bip-0022.mediawiki|BIP 22: getblocktemplate - Fundamentals]]
 * [[bip-0023.mediawiki|BIP 23: getblocktemplate - Pooled Mining]]
 * [[bip-0141.mediawiki|BIP 141: Segregated Witness (Consensus layer)]]
-- 
cgit v1.2.3

