Merge branch 's/swinx' into swinx-nagydani

swarm/docs/refs.bib

@@ -22,15 +22,15 @@ @TECHREPORT{ethersphere2016sw3
 }
 
 @TECHREPORT{ethersphere2016smash,
-  author = {Viktor Tron and Aron Fischer and Daniel Varga},
+  author = {Viktor Tron and Aron Fischer},
   title = {smash-proof: auditable storage in swarm secured by masked audit secret hash},
   institution = {Ethersphere},
   note = {Ethersphere Orange Papers 2},
   year = {2016}
 }
 @TECHREPORT{ethersphere2016swap,
-  author = {Viktor Tron and Aron Fischer},
-  title = {State channel networks: accounting and litigation on the blockchain (tentative title)},
+  author = {Viktor Tron and Aron Fischer and Daniel A Nagy},
+  title = {State channels on swap networks: claims and obligations on and off the blockchain (tentative title)},
   institution = {Ethersphere},
   note = {Ethersphere Orange Papers  (to be published)},
   year = {2016}
@@ -245,6 +245,8 @@ @inproceedings{merkle1980protocols
   organization={IEEE}
 }
 
+# routing p2p papers
+
 @incollection{maymounkov2002kademlia,
   title={Kademlia: A peer-to-peer information system based on the xor metric},
   author={Maymounkov, Petar and Mazieres, David},
@@ -253,3 +255,77 @@ @incollection{maymounkov2002kademlia
   year={2002},
   publisher={Springer}
 }
+
+@inproceedings{roos2015determining,
+  title={Determining the Hop Count in Kademlia-type Systems},
+  author={Roos, Stefanie and Salah, Hani and Strufe, Thorsten},
+  booktitle={IEEE ICCCN},
+  year={2015}
+}
+
+@inproceedings{salah2014characterizing,
+  title={Characterizing graph-theoretic properties of a large-scale DHT: Measurements vs. simulations},
+  author={Salah, Hani and Roos, Stefanie and Strufe, Thorsten},
+  booktitle={Computers and Communication (ISCC), 2014 IEEE Symposium on},
+  pages={1--7},
+  year={2014},
+  organization={IEEE}
+}
+
+
+@inproceedings{kaune2008embracing,
+  title={Embracing the peer next door: Proximity in kademlia},
+  author={Kaune, Sebastian and Lauinger, Tobias and Kova{\v{c}}evi{\'c}, Aleksandra and Pussep, Konstantin},
+  booktitle={Peer-to-Peer Computing, 2008. P2P'08. Eighth International Conference on},
+  pages={343--350},
+  year={2008},
+  organization={IEEE}
+}
+
+@inproceedings{heep2010r,
+  title={R/Kademlia: Recursive and topology-aware overlay routing},
+  author={Heep, Bernhard},
+  booktitle={Telecommunication Networks and Applications Conference (ATNAC), 2010 Australasian},
+  pages={102--107},
+  year={2010},
+  organization={IEEE}
+}
+@inproceedings{varvello2009walkable,
+  title={A Walkable Kademlia network for virtual worlds.},
+  author={Varvello, Matteo and Diot, Christophe and Biersack, Ernst},
+  booktitle={IPTPS},
+  pages={2},
+  year={2009}
+}
+@inproceedings{guangmin2009improved,
+  title={An improved Kademlia routing algorithm for P2P network},
+  author={Guangmin, Liang},
+  booktitle={New Trends in Information and Service Science, 2009. NISS'09. International Conference on},
+  pages={63--66},
+  year={2009},
+  organization={IEEE}
+}
+@inproceedings{wu2007kadstreaming,
+  title={KadStreaming: a novel Kademlia P2P network-based VoD streaming scheme},
+  author={Wu, Jie and Liu, BiSheng and Zhang, ShiYong and Lu, ZhiHui and Zhong, YiPing},
+  booktitle={Computer and Information Technology, 2007. CIT 2007. 7th IEEE International Conference on},
+  pages={405--410},
+  year={2007},
+  organization={IEEE}
+}
+@inproceedings{einziger2013kaleidoscope,
+  title={Kaleidoscope: Adding colors to kademlia},
+  author={Einziger, Gil and Friedman, Roy and Kibbar, Eyal},
+  booktitle={Peer-to-Peer Computing (P2P), 2013 IEEE Thirteenth International Conference on},
+  pages={1--10},
+  year={2013},
+  organization={IEEE}
+}
+@inproceedings{skodzik2014hartkad,
+  title={Hartkad: A hard real-time kademlia approach},
+  author={Skodzik, Jan and Danielis, Peter and Altmann, Vlado and Timmermann, Dirk},
+  booktitle={Consumer Communications and Networking Conference (CCNC), 2014 IEEE 11th},
+  pages={309--314},
+  year={2014},
+  organization={IEEE}
+}

swarm/docs/smash/fig/response-types.tex

@@ -8,7 +8,7 @@
 \begin{tabular}{|l|l|l|l|}
 \hline
  \textbf{challenge} & \textbf{input} & \textbf{storer knows} & \textbf{response} \\ \hline \hline
- MERKLE & smash chunk hash, segment index & & Merkle proof  \\ \cline{1-1} \cline {4-4}
+ Merkle proof & smash chunk hash, segment index & & Merkle proof  \\ \cline{1-1} \cline {4-4}
  ASH & smash chunk hash, seed & & audit secret hash \\ \cline{1-1} \cline {4-4}
  ASH proof & & & chunk segment, ASH proof \\ \hline
  MASH proof & smash chunk hash, seed, & mask ok & audit secret hash, MASH proof \\ \cline{3-4}