summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.mediawiki20
-rw-r--r--bip-0011.mediawiki2
-rw-r--r--bip-0039.mediawiki1
-rw-r--r--bip-0099.mediawiki2
-rw-r--r--bip-0104.mediawiki2
-rw-r--r--bip-0105.mediawiki2
-rw-r--r--bip-0106.mediawiki2
-rw-r--r--bip-0107.mediawiki2
8 files changed, 17 insertions, 16 deletions
diff --git a/README.mediawiki b/README.mediawiki
index b488b10..8e613cc 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -441,13 +441,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Mark Friedenbach, Kalle Alm, BtcDrak
| Standard
| Draft
-|-
+|- style="background-color: #ffcfcf"
| [[bip-0099.mediawiki|99]]
|
| Motivation and deployment of consensus rule changes ([soft/hard]forks)
| Jorge Timón
| Informational
-| Draft
+| Rejected
|- style="background-color: #ffcfcf"
| [[bip-0100.mediawiki|100]]
| Consensus (hard fork)
@@ -476,34 +476,34 @@ Those proposing changes should consider that ultimately consent may rest with th
| Pieter Wuille
| Standard
| Withdrawn
-|-
+|- style="background-color: #ffcfcf"
| [[bip-0104.mediawiki|104]]
| Consensus (hard fork)
| 'Block75' - Max block size like difficulty
| t.khan
| Standard
-| Draft
-|-
+| Rejected
+|- style="background-color: #ffcfcf"
| [[bip-0105.mediawiki|105]]
| Consensus (hard fork)
| Consensus based block size retargeting algorithm
| BtcDrak
| Standard
-| Draft
-|-
+| Rejected
+|- style="background-color: #ffcfcf"
| [[bip-0106.mediawiki|106]]
| Consensus (hard fork)
| Dynamically Controlled Bitcoin Block Size Max Cap
| Upal Chakraborty
| Standard
-| Draft
-|-
+| Rejected
+|- style="background-color: #ffcfcf"
| [[bip-0107.mediawiki|107]]
| Consensus (hard fork)
| Dynamic limit on the block size
| Washington Y. Sanchez
| Standard
-| Draft
+| Rejected
|- style="background-color: #ffcfcf"
| [[bip-0109.mediawiki|109]]
| Consensus (hard fork)
diff --git a/bip-0011.mediawiki b/bip-0011.mediawiki
index e5052eb..8375f55 100644
--- a/bip-0011.mediawiki
+++ b/bip-0011.mediawiki
@@ -23,7 +23,7 @@ A couple of motivating use cases:
* A wallet secured by a "wallet protection service" (WPS). 2-of-2 signatures required transactions will be used, with one signature coming from the (possibly compromised) computer with the wallet and the second signature coming from the WPS. When sending protected bitcoins, the user's bitcoin client will contact the WPS with the proposed transaction and it can then contact the user for confirmation that they initiated the transaction and that the transaction details are correct. Details for how clients and WPS's communicate are outside the scope of this BIP. Side note: customers should insist that their wallet protection service provide them with copies of the private key(s) used to secure their wallets that they can safely store off-line, so that their coins can be spent even if the WPS goes out of business.
-* Three-party escrow (buyer, seller and trusted dispute agent). 2-of-3 signatures required transactions will be used. The buyer and seller and agent will each provide a public key, and the buyer will then send coins into a 2-of-3 CHECKMULTISIG transaction and send the seller and the agent the transaction id. The seller will fulfill their obligation and then ask the buyer to co-sign a transaction ( already signed by seller ) that sends the tied-up coins to him (seller).<br />If the buyer and seller cannot agree, then the agent can, with the cooperation of either buyer or seller, decide what happens to the tied-up coins. Details of how buyer, seller, and agent communicate to gather signatures or public keys are outside the scope of this BIP.
+* Three-party escrow (buyer, seller, and trusted dispute agent). 2-of-3 signatures required transactions will be used. The buyer and seller and agent will each provide a public key, and the buyer will then send coins into a 2-of-3 CHECKMULTISIG transaction and send the seller and the agent the transaction id. The seller will fulfill their obligation and then ask the buyer to co-sign a transaction ( already signed by seller ) that sends the tied-up coins to him (seller).<br />If the buyer and seller cannot agree, then the agent can, with the cooperation of either buyer or seller, decide what happens to the tied-up coins. Details of how buyer, seller, and agent communicate to gather signatures or public keys are outside the scope of this BIP.
==Specification==
diff --git a/bip-0039.mediawiki b/bip-0039.mediawiki
index bd70558..2564aa7 100644
--- a/bip-0039.mediawiki
+++ b/bip-0039.mediawiki
@@ -165,6 +165,7 @@ Rust:
Swift:
* https://github.com/CikeQiu/CKMnemonic
* https://github.com/yuzushioh/WalletKit
+* https://github.com/matter-labs/web3swift/blob/develop/Sources/web3swift/KeystoreManager/BIP39.swift
C++:
* https://github.com/libbitcoin/libbitcoin-system/blob/master/include/bitcoin/system/wallet/mnemonic.hpp
diff --git a/bip-0099.mediawiki b/bip-0099.mediawiki
index 1496557..8882e00 100644
--- a/bip-0099.mediawiki
+++ b/bip-0099.mediawiki
@@ -4,7 +4,7 @@
Author: Jorge Timón <jtimon@jtimon.cc>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0099
- Status: Draft
+ Status: Rejected
Type: Informational
Created: 2015-06-20
License: PD
diff --git a/bip-0104.mediawiki b/bip-0104.mediawiki
index 00db9a3..1244b3e 100644
--- a/bip-0104.mediawiki
+++ b/bip-0104.mediawiki
@@ -5,7 +5,7 @@
Author: t.khan <teekhan42@gmail.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0104
- Status: Draft
+ Status: Rejected
Type: Standards Track
Created: 2017-01-13
License: BSD-2-Clause
diff --git a/bip-0105.mediawiki b/bip-0105.mediawiki
index 125d852..3643562 100644
--- a/bip-0105.mediawiki
+++ b/bip-0105.mediawiki
@@ -5,7 +5,7 @@
Author: BtcDrak <btcdrak@gmail.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0105
- Status: Draft
+ Status: Rejected
Type: Standards Track
Created: 2015-08-21
License: PD
diff --git a/bip-0106.mediawiki b/bip-0106.mediawiki
index f622907..193d4cd 100644
--- a/bip-0106.mediawiki
+++ b/bip-0106.mediawiki
@@ -5,7 +5,7 @@
Author: Upal Chakraborty <bitcoin@upalc.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0106
- Status: Draft
+ Status: Rejected
Type: Standards Track
Created: 2015-08-24
</pre>
diff --git a/bip-0107.mediawiki b/bip-0107.mediawiki
index 84cd6a6..b82db61 100644
--- a/bip-0107.mediawiki
+++ b/bip-0107.mediawiki
@@ -5,7 +5,7 @@
Author: Washington Y. Sanchez <washington.sanchez@gmail.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0107
- Status: Draft
+ Status: Rejected
Type: Standards Track
Created: 2015-09-11
License: PD