Skip to content

Commit 4c6389f

Browse files
authored
Merge pull request bitcoin#1126 from PoWx-Org/master
BIP 52: Durable, Low Energy Bitcoin PoW
2 parents 03e10fa + fecbe1f commit 4c6389f

File tree

10 files changed

+309
-0
lines changed

10 files changed

+309
-0
lines changed

README.mediawiki

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,13 @@ Those proposing changes should consider that ultimately consent may rest with th
279279
| Gavin Andresen
280280
| Informational
281281
| Final
282+
|-
283+
| [[bip-0052.mediawiki|52]]
284+
| Consensus (hard fork)
285+
| Durable, Low Energy Bitcoin PoW
286+
| Michael Dubrovsky, Bogdan Penkovsky
287+
| Standard
288+
| Draft
282289
<!-- 50 series reserved for a group of post-mortems -->
283290
|-
284291
| [[bip-0060.mediawiki|60]]

bip-0052.mediawiki

Lines changed: 302 additions & 0 deletions
Large diffs are not rendered by default.

bip-0052/btc_energy-small.png

60.4 KB
Loading

bip-0052/btc_energy.png

91.3 KB
Loading

bip-0052/emusk_tweet.png

545 KB
Loading

bip-0052/optical_chip.png

223 KB
Loading

bip-0052/optminer.png

62.5 KB
Loading

bip-0052/sim1.png

63.1 KB
Loading

bip-0052/sim2.png

67.3 KB
Loading

bip-0052/sim3.png

69.4 KB
Loading

0 commit comments

Comments
 (0)