summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.mediawiki12
-rw-r--r--bip-0039.mediawiki2
-rw-r--r--bip-0068.mediawiki2
-rw-r--r--bip-0112.mediawiki2
-rw-r--r--bip-0113.mediawiki2
-rw-r--r--bip-0141.mediawiki4
6 files changed, 12 insertions, 12 deletions
diff --git a/README.mediawiki b/README.mediawiki
index b745f51..239294f 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -271,12 +271,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Thomas Kerin, Jean-Pierre Rupp, Ruben de Vries
| Standard
| Draft
-|-
+|- style="background-color: #cfffcf"
| [[bip-0068.mediawiki|68]]
| Relative lock-time using consensus-enforced sequence numbers
| Mark Friedenbach, BtcDrak, Nicolas Dorier, kinoshitajona
| Standard
-| Draft
+| Final
|-
| [[bip-0069.mediawiki|69]]
| Lexicographical Indexing of Transaction Inputs and Outputs
@@ -391,18 +391,18 @@ Those proposing changes should consider that ultimately consent may rest with th
| Matt Corallo, Peter Todd
| Standard
| Draft
-|-
+|- style="background-color: #cfffcf"
| [[bip-0112.mediawiki|112]]
| CHECKSEQUENCEVERIFY
| BtcDrak, Mark Friedenbach, Eric Lombrozo
| Standard
-| Draft
-|-
+| Final
+|- style="background-color: #cfffcf"
| [[bip-0113.mediawiki|113]]
| Median time-past as endpoint for lock-time calculations
| Thomas Kerin, Mark Friedenbach
| Standard
-| Draft
+| Final
|-
| [[bip-0114.mediawiki|114]]
| Merkelized Abstract Syntax Tree
diff --git a/bip-0039.mediawiki b/bip-0039.mediawiki
index ad78ed6..0d05d81 100644
--- a/bip-0039.mediawiki
+++ b/bip-0039.mediawiki
@@ -145,4 +145,4 @@ Haskell:
JavaScript:
* https://github.com/bitpay/bitcore-mnemonic
-* https://github.com/bitcoinjs/bip39 (used by [[https://github.com/blockchain/My-Wallet-V3/blob/v3.8.0/src/hd-wallet.js#L121-L146|blockchain.info public beta]])
+* https://github.com/bitcoinjs/bip39 (used by [[https://github.com/blockchain/My-Wallet-V3/blob/v3.8.0/src/hd-wallet.js#L121-L146|blockchain.info]])
diff --git a/bip-0068.mediawiki b/bip-0068.mediawiki
index 0303924..923441e 100644
--- a/bip-0068.mediawiki
+++ b/bip-0068.mediawiki
@@ -5,7 +5,7 @@
BtcDrak <btcdrak@gmail.com>
Nicolas Dorier <nicolas.dorier@gmail.com>
kinoshitajona <kinoshitajona@gmail.com>
- Status: Draft
+ Status: Final
Type: Standards Track
Created: 2015-05-28
</pre>
diff --git a/bip-0112.mediawiki b/bip-0112.mediawiki
index e19e0e9..0397332 100644
--- a/bip-0112.mediawiki
+++ b/bip-0112.mediawiki
@@ -4,7 +4,7 @@
Author: BtcDrak <btcdrak@gmail.com>
Mark Friedenbach <mark@friedenbach.org>
Eric Lombrozo <elombrozo@gmail.com>
- Status: Draft
+ Status: Final
Type: Standards Track
Created: 2015-08-10
</pre>
diff --git a/bip-0113.mediawiki b/bip-0113.mediawiki
index 8290c13..1c402aa 100644
--- a/bip-0113.mediawiki
+++ b/bip-0113.mediawiki
@@ -3,7 +3,7 @@
Title: Median time-past as endpoint for lock-time calculations
Author: Thomas Kerin <me@thomaskerin.io>
Mark Friedenbach <mark@friedenbach.org>
- Status: Draft
+ Status: Final
Type: Standards Track
Created: 2015-08-10
</pre>
diff --git a/bip-0141.mediawiki b/bip-0141.mediawiki
index 1934e59..4b4a0aa 100644
--- a/bip-0141.mediawiki
+++ b/bip-0141.mediawiki
@@ -108,13 +108,13 @@ If the version byte is 1 to 16, no further interpretation of the witness program
Blocks are currently limited to 1,000,000 bytes (1MB) total size. We change this restriction as follows:
-''Block cost'' is defined as ''Base size'' * 3 + ''Total size''. (rationale<ref>Rationale of using a single composite constraint, instead of two separate limits such as 1MB base data and 3MB witness data: Using two separate limits would make mining and fee estimation nearly impossible. Miners would need to solve a complex non-linear optimization problem to find the set of transactions that maximize fees given both constraints, and wallets would not be able to know what to pay as it depends on which of the two conditions is most constrained by the time miners try to produce blocks with their transactions in. Another problem with such an approach is freeloading. Once a set of transactions hit the base data 1MB constraint, up to 3MB extra data could be added to the witness by just minimally increasing the fee. The marginal cost for extra witness space effectively becomes zero in that case.</ref>)
+''Block weight'' is defined as ''Base size'' * 3 + ''Total size''. (rationale<ref>Rationale of using a single composite constraint, instead of two separate limits such as 1MB base data and 3MB witness data: Using two separate limits would make mining and fee estimation nearly impossible. Miners would need to solve a complex non-linear optimization problem to find the set of transactions that maximize fees given both constraints, and wallets would not be able to know what to pay as it depends on which of the two conditions is most constrained by the time miners try to produce blocks with their transactions in. Another problem with such an approach is freeloading. Once a set of transactions hit the base data 1MB constraint, up to 3MB extra data could be added to the witness by just minimally increasing the fee. The marginal cost for extra witness space effectively becomes zero in that case.</ref>)
''Base size'' is the block size in bytes with the original transaction serialization without any witness-related data, as seen by a non-upgraded node.
''Total size'' is the block size in bytes with transactions serialized as described in [[bip-0144.mediawiki|BIP144]], including base data and witness data.
-The new rule is ''block cost'' ≤ 4,000,000.
+The new rule is ''block weight'' ≤ 4,000,000.
==== Sigops ====