summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sztorc <psztorc01@gmail.com>2019-07-26 16:13:20 -0700
committerPaul Sztorc <psztorc01@gmail.com>2019-09-20 10:25:26 -0700
commitc78766c360218df504cd56a4bb44f75f598c118b (patch)
tree1c27f00a0f8104f4246efc45471f75f723fc4ba6
parentecc00805c283193525552a7be716e11710ca4d3c (diff)
downloadbips-c78766c360218df504cd56a4bb44f75f598c118b.tar.xz
add number 300 and update README
-rw-r--r--README.mediawiki7
-rw-r--r--bip-0300.mediawiki (renamed from bip-hashrate-escrows.mediawiki)2
-rw-r--r--bip-0300/appendix-1.txt (renamed from bip-hashrate-escrows/appendix-1.txt)0
-rw-r--r--bip-0300/images.txt1
-rw-r--r--bip-0300/two-groups.pngbin0 -> 39695 bytes
5 files changed, 9 insertions, 1 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 0f21815..b5c6f10 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -869,6 +869,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0300.mediawiki|300]]
+| Consensus (soft fork)
+| Hashrate Escrows (Consensus layer)
+| Paul Sztorc, CryptAxe
+| Standard
+| Draft
+|-
| [[bip-0301.mediawiki|301]]
| Consensus (soft fork)
| Blind Merged Mining (Consensus layer)
diff --git a/bip-hashrate-escrows.mediawiki b/bip-0300.mediawiki
index 26ed32e..1d7deb6 100644
--- a/bip-hashrate-escrows.mediawiki
+++ b/bip-0300.mediawiki
@@ -1,5 +1,5 @@
<pre>
- BIP: ????
+ BIP: 300
Layer: Consensus (soft fork)
Title: Hashrate Escrows (Consensus layer)
Author: Paul Sztorc <truthcoin@gmail.com>
diff --git a/bip-hashrate-escrows/appendix-1.txt b/bip-0300/appendix-1.txt
index 736a6c4..736a6c4 100644
--- a/bip-hashrate-escrows/appendix-1.txt
+++ b/bip-0300/appendix-1.txt
diff --git a/bip-0300/images.txt b/bip-0300/images.txt
new file mode 100644
index 0000000..2fbbf63
--- /dev/null
+++ b/bip-0300/images.txt
@@ -0,0 +1 @@
+Images used as reference in the documentation.
diff --git a/bip-0300/two-groups.png b/bip-0300/two-groups.png
new file mode 100644
index 0000000..c8a3ffa
--- /dev/null
+++ b/bip-0300/two-groups.png
Binary files differ