merge of 'a0a864483fd54fd4c0442c1fbfb1d8110f7ef75d'

and 'c478b5c0330839ec3394675ff894db719f9bb9d7'
This commit is contained in:
meeh
2019-08-18 22:05:23 +00:00
11 changed files with 427 additions and 58 deletions

View File

@@ -14,23 +14,158 @@ Older versions:
<a href="{{ site_url('docs/api/samv2') }}">SAM V2</a>,
</p>
<h2>Version 3 Language Libraries</h2>
<ul>
<li>C - <a href="https://github.com/i2p/libsam3">libsam3</a></li>
<li>C++ - <a href="https://github.com/i2p/i2psam">i2psam</a></li>
<li>Go - <a href="https://bitbucket.org/kallevedin/sam3">sam3</a>,
<a href="https://github.com/cryptix/goSam">goSam</a> (<a href="http://git.repo.i2p/w/goSam.git">in I2P</a>)</li>
<li>Haskell - <a href="https://github.com/solatis/haskell-network-anonymous-i2p">haskell-network-anonymous-i2p</a></li>
<li>.NET - <a href="https://github.com/SamuelFisher/i2pdotnet">i2pdotnet</a></li>
<li>Nodejs - <a href="https://github.com/redhog/node-i2p">node-i2p</a></li>
<li>Java - <a href="https://github.com/eyedeekay/Jsam">Jsam</a></li>
<li>Python - <a href="https://github.com/l-n-s/i2plib">i2plib</a>,
<a href="https://github.com/majestrate/i2p.socket">i2p.socket</a>,
<a href="https://github.com/MuxZeroNet/leaflet">leaflet</a>,
<a href="https://github.com/str4d/txi2p">txi2p</a></li>
<li>Ruby - <a href="https://github.com/dryruby/i2p.rb">i2p.rb</a></li>
<li>Rust - <a href="https://github.com/stallmanifold/rust-i2p">rust-i2p</a></li>
</ul>
<h2>Known SAM libraries</h2>
<table>
<colgroup>
<col style="width: 8%" />
<col style="width: 8%" />
<col style="width: 5%" />
<col style="width: 4%" />
<col style="width: 3%" />
<col style="width: 2%" />
<col style="width: 65%" />
</colgroup>
<thead>
<tr class="header">
<th>{% trans %}Library Name{% endtrans %}</th>
<th>{% trans %}Language{% endtrans %}</th>
<th>{% trans %}Version{% endtrans %}</th>
<th>{% trans %}STREAM{% endtrans %}</th>
<th>{% trans %}DGRAM{% endtrans %}</th>
<th>{% trans %}RAW{% endtrans %}</th>
<th>{% trans %}Site{% endtrans %}</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td>i2psam</td>
<td>C++, C {% trans %}wrapper{% endtrans %}</td>
<td>3.1</td>
<td>yes</td>
<td>yes</td>
<td>no</td>
<td><a href="https://github.com/i2p/i2psam">github.com/i2p/i2psam</a></td>
</tr>
<tr class="even">
<td>gosam</td>
<td>Go</td>
<td>3.2</td>
<td>yes</td>
<td>no</td>
<td>no</td>
<td><a href="https://github.com/eyedeekay/goSam">github.com/eyedeekay/goSam</a></td>
</tr>
<tr class="odd">
<td>sam3</td>
<td>Go</td>
<td>3.2</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://bitbucket.org/eyedeekay/sam3">bitbucket.org/eyedeekay/sam3</a></td>
</tr>
<tr class="even">
<td>txi2p</td>
<td>Python</td>
<td>3.1</td>
<td>yes</td>
<td>no</td>
<td>no</td>
<td><a href="https://github.com/str4d/txi2p">github.com/str4d/txi2p</a></td>
</tr>
<tr class="odd">
<td>i2p.socket</td>
<td>Python</td>
<td>3.2</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://github.com/majestrate/i2p.socket">github.com/majestrate/i2p.socket</a></td>
</tr>
<tr class="even">
<td>i2plib</td>
<td>Python</td>
<td>3.1</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://github.com/l-n-s/i2plib">github.com/l-n-s/i2plib</a></td>
</tr>
<tr class="odd">
<td>i2p-rs</td>
<td>Rust</td>
<td>3.1</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://github.com/i2p/i2p-rs">github.com/i2p/i2p-rs</a></td>
</tr>
<tr class="even">
<td>libsam3</td>
<td>C</td>
<td>3.1</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://github.com/i2p/libsam3">github.com/i2p/libsam3</a></td>
</tr>
<tr class="odd">
<td>mooni2p</td>
<td>Lua</td>
<td>3.1</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://notabug.org/l-n-s/mooni2p">notabug.org/l-n-s/mooni2p</a></td>
</tr>
<tr class="even">
<td>haskell-a-l-i</td>
<td>Haskell</td>
<td>3.1</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td><a href="https://github.com/solatis/haskell-network-anonymous-i2p">github.com/solatis/haskell-network-anonymous-i2p</a></td>
</tr>
<tr class="odd">
<td>node-i2p</td>
<td>Javascript</td>
<td>3.0</td>
<td>yes</td>
<td>unk</td>
<td>unk</td>
<td><a href="https://github.com/redhog/node-i2p">github.com/redhog/node-i2p</a></td>
</tr>
<tr class="even">
<td>Jsam</td>
<td>Java</td>
<td>3.1</td>
<td>yes</td>
<td>no</td>
<td>no</td>
<td><a href="https://github.com/eyedeekay/Jsam">github.com/eyedeekay/Jsam</a></td>
</tr>
<tr class="odd">
<td>i2pdotnet</td>
<td>.Net</td>
<td>3.0</td>
<td>yes</td>
<td>unk</td>
<td>unk</td>
<td><a href="https://github.com/SamuelFisher/i2pdotnet">github.com/SamuelFisher/i2pdotnet</a></td>
</tr>
<tr class="even">
<td>i2p.rb</td>
<td>Ruby</td>
<td>3.0</td>
<td>yes</td>
<td>no</td>
<td>no</td>
<td><a href="https://github.com/dryruby/i2p.rb">github.com/dryruby/i2p.rb</a></td>
</tr>
</tbody>
</table>
<h2>Version 3 Changes</h2>
<h3>Version 3.0 Changes</h3>
@@ -52,7 +187,9 @@ can forward back I2P datagrams to the client's datagram server.
<h3>Version 3.1 Changes</h3>
<p>
Version 3.1 was introduced in I2P release 0.9.14.
Version 3.1 was introduced in I2P release 0.9.14. SAM 3.1 is the recommended
minimum SAM implementation because of its support for better signature types
than SAM 3.0.
<ul>
<li>DEST GENERATE and SESSION CREATE now support a SIGNATURE_TYPE parameter.
<li>The MIN and MAX parameters in HELLO VERSION are now optional.

View File

@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}The Network Database{% endtrans %}{% endblock %}
{% block lastupdated %}{% trans %}January 2019{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.38{% endblock %}
{% block lastupdated %}{% trans %}August 2019{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.42{% endblock %}
{% block content %}
<h2>{% trans %}Overview{% endtrans %}</h2>
@@ -88,6 +88,17 @@ Above the minimum threshold, the advertised bandwidth is not used or trusted any
in the router, except for display in the user interface and for debugging and network analysis.
{%- endtrans %}</p>
<p>Valid NetID numbers:</p>
<table><tr><th>Usage<th>NetID Number
<tr><td>Reserved<td>0
<tr><td>Reserved<td>1
<tr><td>Current Network (default)<td>2
<tr><td>Reserved Future Networks<td>3 - 15
<tr><td>Forks and Test Networks<td>16 - 254
<tr><td>Reserved<td>255
</table>
<h3>{% trans %}Additional Options{% endtrans %}</h3>
<p>{% trans stats=i2pconv('stats.i2p') -%}

View File

@@ -26,20 +26,23 @@ the "Donate" edition. I2P funding is handled by meeh.{% endtrans %}<br>
<br>
{% trans %}The following addresses are valid as of June 10th, 2019. Please note
that any other addresses not listed here are no longer valid. Please note that
addresses may update and more coins may be added.{% endtrans %}
addresses may update and more coins may be added. {% endtrans %}
<br><br>
{% trans %} Double-Clicking on the cryptocurrency address will copy it onto your
clipboard.{% endtrans %}
<br></p>
<b>{% trans %}BTC Address{% endtrans %}: 3AtDiRUiyDHTSALRxsEZ7yqmB7piwaowaY</b><br>
<img width="250px" src="{{ url_for('static', filename='images/donate/cur-btc-addr.png') }}" /><br>
<b>{% trans %}LTC Address{% endtrans %}: MN55tu4y7UtdPXUk9WvCSfy4nGUW79DZpN</b><br>
<img width="250px" src="{{ url_for('static', filename='images/donate/cur-ltc-addr.png') }}" /><br>
<b>{% trans %}ETH Address{% endtrans %}: 0xfC35D2225bA2739eCC5a1e50676a8DbC03569C27</b><br>
<img width="250px" src="{{ url_for('static', filename='images/donate/cur-eth-addr.png') }}" /><br>
<b>{% trans %}ANC Address{% endtrans %}: ANi2pB8RTeuWFf9wki6Ffiv9RJqioQydrH</b><br>
<img width="250px" src="{{ url_for('static', filename='images/donate/cur-anc-addr.png') }}" /><br>
<b>{% trans %}XMR Address{% endtrans %}: 447kucUDzM21jDxdmx7h2jFT4UT4PprD8EMjDk4Bc471gRGkbeZSfSPHcB7JtiumR7gNRJgKqf1dHa2T49nQ7jsfSZSfoLA</b><br>
<img width="250px" src="{{ url_for('static', filename='images/donate/cur-xmr-addr.png') }}" /><br>
<img class="qrcode" width="250px" src="{{ url_for('static', filename='images/donate/cur-btc-addr.png') }}" />
<b class="address">{% trans %}BTC Address{% endtrans %}:</b> <textarea ondblclick="copy(this)" class="coinaddr" rows="1" readonly>3AtDiRUiyDHTSALRxsEZ7yqmB7piwaowaY</textarea><br>
<img class="qrcode" width="250px" src="{{ url_for('static', filename='images/donate/cur-ltc-addr.png') }}" />
<b class="address">{% trans %}LTC Address{% endtrans %}:</b> <textarea ondblclick="copy(this)" class="coinaddr" rows="1" readonly>MN55tu4y7UtdPXUk9WvCSfy4nGUW79DZpN</textarea><br>
<img class="qrcode" width="250px" src="{{ url_for('static', filename='images/donate/cur-eth-addr.png') }}" />
<b class="address">{% trans %}ETH Address{% endtrans %}:</b> <textarea ondblclick="copy(this)" class="coinaddr" rows="1" readonly>0xfC35D2225bA2739eCC5a1e50676a8DbC03569C27</textarea><br>
<img class="qrcode" width="250px" src="{{ url_for('static', filename='images/donate/cur-anc-addr.png') }}" />
<b class="address">{% trans %}ANC Address{% endtrans %}:</b> <textarea ondblclick="copy(this)" class="coinaddr" rows="1" readonly>ANi2pB8RTeuWFf9wki6Ffiv9RJqioQydrH</textarea><br>
<img class="qrcode" width="250px" src="{{ url_for('static', filename='images/donate/cur-xmr-addr.png') }}" />
<b class="address">{% trans %}XMR Address{% endtrans %}:</b> <textarea ondblclick="copy(this)" class="coinaddr" rows="1" readonly>447kucUDzM21jDxdmx7h2jFT4UT4PprD8EMjDk4Bc471gRGkbeZSfSPHcB7JtiumR7gNRJgKqf1dHa2T49nQ7jsfSZSfoLA</textarea><br>
<p>{% trans %}We now also accept paypal donations!{% endtrans %}</p>
<p><b>{% trans %}We now also accept paypal donations!{% endtrans %}</b></p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick" />
<input type="hidden" name="hosted_button_id" value="WJA7BJTH89JKN" />
@@ -47,6 +50,30 @@ addresses may update and more coins may be added.{% endtrans %}
<img alt="" border="0" src="https://www.paypal.com/en_NO/i/scr/pixel.gif" width="1" height="1" />
</form>
<div class="emailforms">
<h2>{% trans %}Let us know about your donation{% endtrans %}</h2>
<p>{% trans %}If you wish, you can inform us of your donation using the form just below.
This is not a required step for your donation to succeed, but if you want to
make sure we know you're out there, get ahold of us here.{% endtrans %}
</p>
<script type="text/javascript">
function copy(that){
var inp = document.createElement('textarea');
document.body.appendChild(inp)
inp.value = that.textContent
inp.select();
document.execCommand('copy', false);
inp.remove();
}
</script>
<form action="mailto:someone@example.com" method="post" enctype="text/plain">
<span class="emaillabel">{% trans %}Preferred Name: {% endtrans %}</span><input class="emailform" type="text" name="firstname"><br>
<span class="emaillabel">{% trans %}E-mail: {% endtrans %}</span><input class="emailform" type="text" name="mail"><br>
<span class="emaillabel">{% trans %}Message: {% endtrans %}</span><input class="emailform messagebox" type="text" name="comment"><br><br>
<input class="emailbutton" type="submit" value="Send">
<input class="emailbutton" type="reset" value="Reset">
</form>
</div>
<h2>{% trans %}Tax Status{% endtrans %}</h2>
<p>{% trans -%}