Update Whirlpool to 10.8
* update instructions compatible with whirlpool gui v0.10.2; * update whirlpool * update readme * increase dojo timeout * add whirlpool PGP and check shasum of whirlpool * update signature and revert unintended dojo commit * update setup_device * correct shasum filename Co-authored-by: Taylor Helsper <tehelsper@gmail.com>
This commit is contained in:
Abhishek Shandilya
GitHub
parent
983ffb1d71
commit
b5a266fe8c
|
|
@ -35,7 +35,7 @@ Each myNode device comes with a number of wonderful features:
|
|||
- BTCPay Server (v1.0.4.4)
|
||||
- RTL (Ride the Lightning) - Lightning Wallet (v0.9.0-beta)
|
||||
- Samourai Dojo (v1.5.0)
|
||||
- Samourai Whirlpool (whirlpool-client-cli v0.10.5)
|
||||
- Samourai Whirlpool (whirlpool-client-cli v0.10.8)
|
||||
- Specter Desktop (v0.7.2)
|
||||
- Thunderhub (v0.9.8)
|
||||
- BTC RPC Explorer (v2.0.2)
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ curl https://keybase.io/roasbeef/pgp_keys.asc | gpg --import
|
|||
curl https://raw.githubusercontent.com/JoinMarket-Org/joinmarket-clientserver/master/pubkeys/AdamGibson.asc | gpg --import
|
||||
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 01EA5486DE18A882D4C2684590C8019E36C2E964
|
||||
curl https://keybase.io/suheb/pgp_keys.asc | gpg --import
|
||||
curl https://samouraiwallet.com/pgp.txt | gpg --import # two keys from Samourai team
|
||||
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys DE23E73BFA8A0AD5587D2FCDE80D2F3F311FD87E #loopd
|
||||
$TORIFY curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --import # tor
|
||||
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - # tor
|
||||
|
|
@ -412,8 +413,10 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
|
|||
fi
|
||||
|
||||
# Install Whirlpool
|
||||
WHIRLPOOL_VERSION="0.10.5"
|
||||
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/$WHIRLPOOL_VERSION/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
|
||||
WHIRLPOOL_VERSION="0.10.8"
|
||||
WHIRLPOOL_HASH="62e17b6020d0821a98e99ebb773b46191770ec186ceaa3e616a428f5cafe9f49"
|
||||
WHIRLPOOL_UPGRADE_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/7998ea5a9bb180451616809bc346b9ac/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
|
||||
WHIRLPOOL_SIG_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/8d919af2d97657a835195a928e7646bc/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar.sig.asc
|
||||
WHIRLPOOL_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.whirlpool_url
|
||||
CURRENT=""
|
||||
if [ -f $WHIRLPOOL_UPGRADE_URL_FILE ]; then
|
||||
|
|
@ -425,6 +428,12 @@ if [ "$CURRENT" != "$WHIRLPOOL_UPGRADE_URL" ]; then
|
|||
sudo rm -rf *.jar
|
||||
sudo -u bitcoin wget -O whirlpool.jar $WHIRLPOOL_UPGRADE_URL
|
||||
|
||||
echo "$WHIRLPOOL_HASH whirlpool.jar" > /tmp/whirlpool.shasum
|
||||
sha256sum --check /tmp/whirlpool.shasum
|
||||
rm /tmp/whirlpool.shasum
|
||||
wget -O whirlpool.asc $WHIRLPOOL_SIG_URL
|
||||
gpg --verify whirlpool.asc
|
||||
|
||||
echo $WHIRLPOOL_UPGRADE_URL > $WHIRLPOOL_UPGRADE_URL_FILE
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="app_tile_row">
|
||||
<div class="app_tile">
|
||||
<div class="app_status_icon {{ rtl_status_color }}"></div>
|
||||
<!--
|
||||
<!--
|
||||
Sample Help Tooltip for each app
|
||||
<img class="app_tooltip" src="{{ url_for('static', filename="images/help_icon.png")}}" title="RTL is a web app for managing your lightning wallet"/>
|
||||
-->
|
||||
|
|
@ -222,4 +222,4 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,17 @@
|
|||
<div class="mynode_back_div">
|
||||
<a class="ui-button ui-widget ui-corner-all mynode_back" href="/"><span class="ui-icon ui-icon-home"></span>home </a>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="main_header">Samourai Whirlpool</div>
|
||||
<div class="app_tile_row">
|
||||
<div class="info_tile">
|
||||
<div class="info_tile_header">Toggle</div>
|
||||
<div class="info_tile_contents">
|
||||
<a class="ui-button ui-widget ui-corner-all mynode_button_small" style="width: 70%;" href="/toggle-whirlpool">
|
||||
{% if whirlpool_enabled %}Disable{% else %}Enable{% endif %}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="info_tile">
|
||||
<div class="info_tile_header">Status</div>
|
||||
<div class="info_tile_contents">{{whirlpool_status}}</div>
|
||||
|
|
@ -39,17 +47,15 @@
|
|||
<div class="instructions">
|
||||
<div class="instructions-header">Instructions to setup Whirlpool</div>
|
||||
<ol class="instructions-steps">
|
||||
<li>You will need the Samourai wallet passphrase and pairing payload in next steps.</li>
|
||||
<li>To get the pairing payload, open up your Samourai mobile wallet. Press 3 dots on top right -> Settings -> Transactions-> Pair to Whirlpool GUI. Copy the code to clipboard and send the code to yourself securely. It would look something like:<br>{"pairing":{"type":"whirlpool.gui","version":"3.0.0"...</li>
|
||||
<li>Download and install Whirlpool GUI from <a href="https://github.com/Samourai-Wallet/whirlpool-gui/releases" target="_blank">https://github.com/Samourai-Wallet/whirlpool-gui/releases</a>.</li>
|
||||
<li>Ensure that Whirlpool is running on myNode and status is "Waiting for initialization".</li>
|
||||
<li>Select "Connect to remote CLI". Type in https://mynode.local (or the IP address of your myNode in the https://<mynode-IP-address> format), leave the port as 8899 and leave the API key field empty. Click on "Connect".</li>
|
||||
<li>Once connected, paste the pairing payload from Step 2, enable Tor using the slider and click on "Initialize GUI".</li>
|
||||
<li>Initialization is successful if you see "CLI restart required. Wallet inizialization success". Repeat steps 3-6 if you don't see it.</li>
|
||||
<li>Restart myNode Whirlpool by clicking on "Restart" button above.</li>
|
||||
<li>myNode Whirlpool status should now be "Running" and API key should now be visible. This API key is useful if you reset the Whirlpool GUI.</li>
|
||||
<li>Click on "Retry to connect" if it doesn't connect automatically.</li>
|
||||
<li>Type in the Samourai mobile wallet passphrase (not the pairing payload) and click on "Sign in".</li>
|
||||
<li>Ensure that whirlpool is enabled and you see "Waiting for initialization.." on status tile.</li>
|
||||
<li>Download and install Whirlpool GUI v0.10.2 from <a href="https://samouraiwallet.com/download" target="_blank">https://samouraiwallet.com/download</a>.</li>
|
||||
<li>On the installed Whirlpool GUI, select "Advanced: remote CLI". Type in https://mynode.local:8899 (or use the raw IP address) and click on "Connect".</li>
|
||||
<li>Follow the instructions and scan your payload. Use secure channels if you are copy/pasting the payload.</li>
|
||||
<li>Once connected, enable Tor using the slider and click on "Initialize GUI".</li>
|
||||
<li>It might take few seconds to initialize GUI or click on the retry button.</li>
|
||||
<li>Refresh this page to see the status change to "Running" and the API key.</li>
|
||||
<li>Type in the passphrase used in Samourai mobile wallet and click on "Sign in".</li>
|
||||
<li>It might take few seconds to authenticate and show the available pools.</li>
|
||||
<li>Enjoy mixing your coins!</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -57,8 +63,8 @@
|
|||
|
||||
<div class="instructions-header">Tips and Notes</div>
|
||||
<ul style="font-size: 12px;">
|
||||
<li>The pairing payload contains an encrypted version of your Samourai mobile wallet password/passphrase
|
||||
which enables the Whirlpool GUI to interface with your Samourai wallet. If you receive
|
||||
<li>The pairing payload contains an encrypted version of your Samourai mobile wallet password/passphrase
|
||||
which enables the Whirlpool GUI to interface with your Samourai wallet. If you receive
|
||||
"authentication /passphrase invalid errors" when you try to open the GUI, you need to update your
|
||||
pairing payload and repeat this procedure so that it contains your current Samourai password. Note
|
||||
that the payload should be sent to yourself by secure channels to prevent it from being
|
||||
|
|
@ -66,4 +72,4 @@
|
|||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -506,8 +506,10 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
|
|||
fi
|
||||
|
||||
# Install Whirlpool
|
||||
WHIRLPOOL_VERSION="0.10.5"
|
||||
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/$WHIRLPOOL_VERSION/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
|
||||
WHIRLPOOL_VERSION="0.10.8"
|
||||
WHIRLPOOL_HASH="62e17b6020d0821a98e99ebb773b46191770ec186ceaa3e616a428f5cafe9f49"
|
||||
WHIRLPOOL_UPGRADE_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/7998ea5a9bb180451616809bc346b9ac/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
|
||||
WHIRLPOOL_SIG_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/8d919af2d97657a835195a928e7646bc/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar.sig.asc
|
||||
WHIRLPOOL_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.whirlpool_url
|
||||
CURRENT=""
|
||||
if [ -f $WHIRLPOOL_UPGRADE_URL_FILE ]; then
|
||||
|
|
@ -519,6 +521,11 @@ if [ "$CURRENT" != "$WHIRLPOOL_UPGRADE_URL" ]; then
|
|||
sudo rm -rf *.jar
|
||||
sudo -u bitcoin wget -O whirlpool.jar $WHIRLPOOL_UPGRADE_URL
|
||||
|
||||
echo "$WHIRLPOOL_HASH whirlpool.jar" > WHIRLPOOL_SHASUM
|
||||
sha256sum --check WHIRLPOOL_SHASUM
|
||||
wget -O whirlpool.asc $WHIRLPOOL_SIG_URL
|
||||
gpg --verify whirlpool.asc
|
||||
|
||||
echo $WHIRLPOOL_UPGRADE_URL > $WHIRLPOOL_UPGRADE_URL_FILE
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user