diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-04-23 20:20:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-04-23 20:20:13 +0000 |
| commit | 4683a9b71424bac4d43af2236f36fdc2b0c9f470 (patch) | |
| tree | 49611a1d80a1cf4cafbdb213e9d0af8104aaa15a | |
| parent | 7e99bbf958911888999e100d3d6f8738acb61928 (diff) | |
| download | bips-4683a9b71424bac4d43af2236f36fdc2b0c9f470.tar.xz | |
BIP 9 (& 145): Switch to rules/vbavailable/vbrequired GBT interface
| -rw-r--r-- | bip-0009.mediawiki | 8 | ||||
| -rw-r--r-- | bip-0145.mediawiki | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bip-0009.mediawiki b/bip-0009.mediawiki index 1da083d..459486f 100644 --- a/bip-0009.mediawiki +++ b/bip-0009.mediawiki @@ -180,15 +180,15 @@ The template Object is also extended: |- ! Key !! Required !! Type !! Description |- -| rules || {{Yes}} || Object || set of pending, supported softfork deployments; each uses the softfork name as the key, and the softfork bit as its value +| rules || {{Yes}} || Array of Strings || list of softfork deployments, by name, that are active state |- -| rulesrequired || {{No}} || Array of Strings || list of softfork deployments the server requires support for +| vbavailable || {{Yes}} || Object || set of pending, supported softfork deployments; each uses the softfork name as the key, and the softfork bit as its value |- -| rulesenforced || {{Yes}} || Array of Strings || list of softfork deployments that are active state +| vbrequired || {{No}} || Number || bit mask of softfork deployment version bits the server requires enabled in submissions |} The "version" key of the template is retained, and used to indicate the server's preference of deployments. -Miners MAY clear or set bits in the block version WITHOUT any special "mutable" key, provided they are listed among the template's "rules" and (when clearing is desired) NOT listed in "rulesrequired". +Miners MAY clear or set bits in the block version WITHOUT any special "mutable" key, provided they are listed among the template's "vbavailable" and (when clearing is desired) NOT included as a bit in "vbrequired". ==Support for future changes== diff --git a/bip-0145.mediawiki b/bip-0145.mediawiki index f7a1e61..bdaabc9 100644 --- a/bip-0145.mediawiki +++ b/bip-0145.mediawiki @@ -41,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 "rulesenforced" list (see [[bip-0009.mediawiki#getblocktemplate_changes|BIP 9]]) includes "segwit". +Transactions with witness data may only be included if the template's "rules" list (see [[bip-0009.mediawiki#getblocktemplate_changes|BIP 9]]) includes "segwit". ===Sigops=== -For blocks with segwit enforcement, the "sigoplimit" and "sigops" keys must use the new values as calculated in [[bip-0141.mediawiki#Sigops|BIP 141]]. +For templates with "segwit" enabled as a rule, the "sigoplimit" and "sigops" keys must use the new values as calculated in [[bip-0141.mediawiki#Sigops|BIP 141]]. ===Block Assembly with Witness Transactions=== |