IPFS Improvements

scripts/ipfs/install

@@ -4,7 +4,7 @@ true
 
 set -e
 
-GO_IPFS_VERSION=v0.4.18
+GO_IPFS_VERSION=v0.4.19
 
 # Hyperborea connected peer used to bootstrap hyperborea only ipfs nodes
 # DarkDrgn2k's peer
@@ -38,6 +38,16 @@ ipfs config Pubsub.Router gossipsub
 # Enable Filestore for --nocopy capability
 ipfs config --bool Experimental.FilestoreEnabled true
 
+# Setup connection management - Reduce connections to stress the Pi less
+# XXX: These values need to be tweaked and tested
+ipfs config Swarm.ConnMgr.Type basic
+ipfs config Swarm.ConnMgr.LowWater 100
+ipfs config Swarm.ConnMgr.HighWater 200
+ipfs config Swarm.ConnMgr.GracePeriod 60s
+
+# Enable QUIC for better connections when possible
+ipfs config --bool Experimental.QUIC true 
+
 # Configure HTTP to IPFS gateway
 sudo cp "$BASE_DIR/ipfs-http-gateway.conf" /etc/nginx/site-path-enabled/ipfs-http-gateway.conf
 sudo systemctl restart nginx.service

scripts/ipfs/ipfs-swarm.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
-# shellcheck disable=SC2162
-true
 
-# Wait for ipfs to initalize
-attempts=15
+# This script connects to local mesh peers,
+# and it sets up connection filters based on what networks this node can access.
+# It runs continually, to change IPFS settings as the environment around the node changes.
+
+
+# Wait for IPFS to initalize
+attempts=10
 until [[ $(curl http://localhost:5001/api/v0/id -s 2>/dev/null) || ${attempts} -eq 0 ]]; do
-    sleep 1
+    sleep 3
     attempts=$((attempts-1))
 done
 
 if [[  ${attempts} -eq 0 ]]; then
+    echo "Error: Failed to connect to local IPFS daemon. Is it running?"
     exit 1
 fi
 
@@ -21,9 +25,16 @@ function addPeer  {
         id=$(echo "${res}" | jq -r -M '.services.ipfs.ID')
         # Value is found
         if [[ ! ${id} == "null" ]] && [[ ! "${id}" == "" ]]; then
-            # Connect to neighbouring ipfs
-            ipfs swarm connect "/ip6/${addr}/tcp/4001/ipfs/${id}"
-            echo "Connecting to ${addr}"
+            # Connect to neighbouring IPFS nodes
+            # Check for QUIC connections first
+            if [ "$(echo "${res}" | jq -r -M '.services.IPFS.quic_enabled')" == 'true' ]; then
+                # ID is not needed for QUIC connections
+                echo "Connecting to ${addr} with QUIC"
+                ipfs swarm connect "/ip6/${addr}/udp/4001/quic"
+            else
+                echo "Connecting to ${addr} over TCP"
+                ipfs swarm connect "/ip6/${addr}/tcp/4001/ipfs/${id}"
+            fi
         fi
     fi
 }
@@ -47,4 +58,4 @@ if [ "$(which yggdrasil)" ]; then
 fi
 
 # Update peers data since ipfs just started
-sudo /usr/local/bin/nodeinfo-update.sh
+sudo /usr/local/bin/nodeinfo-update.sh

scripts/ipfs/nodeinfo-ipfs

@@ -14,6 +14,12 @@ fi
 echo '"ipfs":{'
 echo '"version":'${version}','
 
+if [ quic_enabled = "$(ipfs config Experimental.QUIC)" ]; then
+    echo '"quic_enabled":"'${quic_enabled}'",'
+else
+    echo '"quic_enabled":"false",'
+fi
+
 echo '"ID":'${id}
 
 echo "},"

scripts/ipfs/uninstall

@@ -3,7 +3,7 @@
 set -e
 
 # Remove script and service for ipfs bootstrap
-sudo rm -r /usr/local/bin/ipfs-swarm-cjdns.sh || true
+sudo rm -r /usr/local/bin/ipfs-swarm.sh || true
 
 # Uninstall dependencies
 sudo apt-get remove -y jq