merge

altcoin/filecoin.md

@@ -7,21 +7,13 @@
 
 ### IPFS vs BitTorrent
 + IPFS deduplicates across "torrents"
+    * for torrents, there is essentially a separate swarm for every torrent. Two big torrents with only a few small files differing won't share peers as IPFS does, for example.
+    * the way Bittorrent chunks content into blocks doesn't work for all types of content (and isn't designed for deduplication between torrents).
 + ipfs has trackerless peer discovery
     * magnet links have this too
 + ipfs can download part of a collection
 + ipfs has Pubsub
 + ipfs has mutiblity mechanisms
 + ipfs has proof of storage
-    *  prove you have a compete file by only sending some of it
+    *  prove you have a complete file by only sending some of it
 + ipfs takes several good ideas from protocols like Bittorrent, Git, SFS, Bitcoin and the web
-+ the main advantage is the fact that there is only a single massive swarm, where anybody can give a block to everybody.
-    * for torrents, there is essentially a separate swarm for every torrent. Two big torrents with only a few small files differing won't share peers as IPFS does, for example.
-    * the way Bittorrent chunks content into blocks doesn't work for all types of content (and isn't designed for deduplication between torrents).
-
-
-+ https://github.com/ipfs/notes/issues/208
-+ https://www.reddit.com/r/ipfs/comments/8qbgj3/whats_the_practical_difference_between_ipfs_and/
-+ https://www.reddit.com/r/ipfs/comments/7gnqox/why_hasnt_ipfs_taken_over_the_torrents_yet/
-+ https://www.reddit.com/r/ipfs/comments/a694jd/ipfs_vs_torrents_from_a_filtering_perspective/
-+ https://medium.com/@kidinamoto/ipfs-vs-bittorrent-9f1c3adb8fcd

bitcoin/readme.md

@@ -278,7 +278,6 @@ Revocable Sequence Maturity Contract (RSMC):[1] a contract used in Lightning to
     - 希望赚交易费用，而闪电网络把大量小额交易都隔离开了
 
 ##### 闪电网络
-
 see [Lightning Network](#lightning-network)
 
 + 主要支持者:Bitcoin Core

mining.md

@@ -119,4 +119,4 @@ Anti-ASIC 算法,试图达到这一目标,但这些算法都不尽人意。这
 * DDoS
     - 一层硬件防火墙
     - 软件防火墙不太行
-* 藏块攻击
+* [藏块攻击](/blockchain/attack.md)