Add link to fork activation discussion

[bitcoinninja] / index.html

diff --git a/index.html b/index.html
index fe094733ff22384a62bc0a5bb99da170e9c4e037..f571f690d81120239eb9e654df554be8df94619e 100644 (file)
--- a/index.html
+++ b/index.html
@@ -15,23 +15,28 @@ Public summaries of some wizardly thinking:
 <li><a href="https://download.wpsoftware.net/bitcoin/wizardry/brs-arbitrary-output-sizes.txt">Output size obfuscation for Bytecoin</a></li>
 <li><a href="https://iwilcox.me.uk/2014/no-from-address">There Is No 'From' Address</a></li>
 <li><a href="https://iwilcox.me.uk/2014/proving-bitcoin-reserves">Proving Your Bitcoin Reserves</a></li>
+<li><a href="https://bitcoin.ninja/BitcoinPhilosophy201_ForkActivationMethods.ogg">A discussion on soft fork activation concerns</a> (<a href="https://bitcoin.ninja/BitcoinPhilosophy201_ForkActivationMethods.mp3">alternative in mp3 format</a>)</li>
 </ul>
 
 Useful resources:
 <ul>
-<li><a href="https://botbot.me/freenode/bitcoin-wizards/">#bitcoin-wizards logs here</a></li>
+<li><a href="http://gnusha.org/bitcoin-wizards/">#bitcoin-wizards logs here</a></li>
+<li><a href="https://freenode.irclog.whitequark.org/bitcoin-wizards/">Alternative #bitcoin-wizards logs here</a></li>
 <li><a href="http://download.wpsoftware.net/bitcoin/wizards/">Old #bitcoin-wizards logs here</a></li>
 <li><a href="http://bitcoin.sipa.be/">Sipa's hashrate statistics</a></li>
 <li><a href="https://en.bitcoin.it/wiki/User:Gmaxwell/alt_ideas">Gmaxwell's alt-ideas page</a></li>
+<li><a herf="https://en.bitcoin.it/wiki/Hardfork_Wishlist">Hardfork wishlist</a></li>
 <li><a href="http://diyhpl.us/~bryan/papers2/bitcoin/">Bitcoin-related papers archived by kanzure</a></li>
 </ul>
 
 Papers of interest:
 <ul>
-<li><a href="https://github.com/citp/bitcoin-sok">Bitcoin systematization of knowledge</a></li>
+<li><a href="http://www.jbonneau.com/doc/BMCNKF15-IEEESP-bitcoin.pdf">Bitcoin systematization of knowledge</a></li>
+<li><a href="http://arxiv.org/pdf/1311.0243v5.pdf">Majority is not Enough: Bitcoin Mining is Vulnerable</a></li>
 <li><a href="http://freico.in/docs/freimarkets.pdf">Freimarkets: a bitcoin extension to support user issued assets, p2p lending, options and more.</a></li>
 <li><a href="http://blockstream.com/sidechains.pdf">Enabling Blockchain Innovations with Pegged Sidechains</a></li>
 <li><a href="https://bitcoin.org/bitcoin.pdf">Bitcoin: A Peer-to-Peer Electronic Cash System</a></li>
+<li><a href="http://lightning.network/lightning-network-paper.pdf">Lightning Network: Payment Channel Networks Squared</a></li>
 </ul>
 
 <a href="http://sagemath.org/">Sage</a> notebooks:
@@ -47,9 +52,14 @@ Implementations of cool things:
 <li><a href="https://github.com/petertodd/timelock">Create a secret key that can be decrypted in a known amount of time using parallel-serial hash chains.</a></li>
 <li><a href="https://github.com/Blockstream/contracthashtool">Pay to Contract Hash calculator</a></li>
 <li><a href="https://github.com/vinumeris/lighthouse/blob/master/docs/Design%20doc.md">Lighthouse - simple SIGHASH_ANYONECANPAY multi-party payments</a></li>
+<li><a href="https://lists.linuxfoundation.org/pipermail/lightning-dev/2015-November/000344.html">The "Mysterious 57" scriptPubkey template which can only be spent by revealing its key.</a></li>
+<li><a href="https://github.com/bitcoinfibre/bitcoinfibre">Bitcoin FIBRE: A fast-block-relay implementation using UDP and Forward Error Correction with super reliable performance</a></li>
 </ul>
 
-Edit this page at <a href="https://github.com/TheBlueMatt/bitcoinninja">https://github.com/TheBlueMatt/bitcoinninja</a>
+Edit this page at <a href="https://git.bitcoin.ninja/?p=bitcoinninja">https://git.bitcoin.ninja?p=bitcoinninja</a><br>
+<br>
+Help people in countries that censor the internet access Tor. Leave this page open with Snowflake turned on:<br>
+<iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="250px" frameborder="0" scrolling="no"></iframe>
 
 </body>
 </html>