chore: [sc-1850] Release Relay v1.16 (#8)

Author: teghnet

keeman/default.nix

@@ -0,0 +1,25 @@
+{ pkgs }: with pkgs;
+stdenv.mkDerivation rec {
+  pname = "keeman";
+  version = "0.1.0";
+  src = ./.;
+
+  nativeBuildInputs = with pkgs; [
+    makeWrapper
+    autoPatchelfHook
+  ];
+  installPhase = ''
+    set -e
+    mkdir -p $out/bin
+    cp $src/keeman $out/bin/
+    chmod +x $out/bin/*
+    find $out/bin -type f | while read -r x; do
+      wrapProgram "$x"
+    done
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/keeman --version
+  '';
+}

keeman/keeman

@@ -34,10 +34,11 @@ in rec {
   setzer = pkgs.callPackage sources.setzer { };
   ethsign = pkgs.callPackage (import ../ethsign) { };
   foundry = pkgs.callPackage (import ../foundry) { inherit (nixpkgs2) pkgs; };
+  keeman = pkgs.callPackage (import ../keeman) { inherit (nixpkgs2) pkgs; };
 
   omnia = pkgs.callPackage (import ../omnia) {
     inherit ssb-server oracle-suite setzer ethsign foundry;
   };
 
-  install-relay = pkgs.callPackage ../systemd { inherit omnia ssb-server oracle-suite; };
+  install-relay = pkgs.callPackage ../systemd { inherit omnia ssb-server oracle-suite keeman; };
 }

nix/default.nix

@@ -72,15 +72,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "oracle-suite": {
-        "branch": "v0.9.0",
+        "branch": "v0.9.1",
         "description": null,
         "homepage": null,
         "owner": "chronicleprotocol",
         "repo": "oracle-suite",
-        "rev": "afa937668f81e2b583294d24e116c2e448e5f988",
-        "sha256": "15k8knsqjalhzy9mdmmi8ppq776gqr05dh15b495vy3bbxzzrrbw",
+        "rev": "948262fc6a377472c2b3157a7f18520c74dc3265",
+        "sha256": "1q37928h1d44j0mv19jks56glx155bg292h8wrpfdqq6wbmfrdwy",
         "type": "tarball",
-        "url": "https://github.com/chronicleprotocol/oracle-suite/archive/afa937668f81e2b583294d24e116c2e448e5f988.tar.gz",
+        "url": "https://github.com/chronicleprotocol/oracle-suite/archive/948262fc6a377472c2b3157a7f18520c74dc3265.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "setzer": {

nix/sources.json

@@ -61,7 +61,7 @@
       "msgExpiration": 1800,
       "oracle": "0x0Aca91081B180Ad76a848788FC76A089fB5ADA72",
       "oracleExpiration": 14400,
-      "oracleSpread": 3
+      "oracleSpread": 10
     },
     "LINK/USD": {
       "msgExpiration": 1800,

omnia/config/relay-ethereum-goerli.json

@@ -75,8 +75,8 @@
     "IBTA/USD": {
       "msgExpiration": 1800,
       "oracle": "0xa5d4a331125D7Ece7252699e2d3CB1711950fBc8",
-      "oracleExpiration": 14400,
-      "oracleSpread": 3
+      "oracleExpiration": 86400,
+      "oracleSpread": 10
     },
     "LINK/USD": {
       "msgExpiration": 1800,
@@ -99,7 +99,7 @@
     "MKR/USD": {
       "msgExpiration": 1800,
       "oracle": "0xdbbe5e9b1daa91430cf0772fcebe53f6c6f137df",
-      "oracleExpiration": 14400,
+      "oracleExpiration": 86400,
       "oracleSpread": 3
     },
     "RETH/USD": {

omnia/config/relay-ethereum-mainnet.json

@@ -1,10 +1,10 @@
-{ stdenv, lib, makeWrapper, shellcheck, glibcLocales, coreutils, gettext, jq, omnia, ssb-server, oracle-suite, tor }:
+{ stdenv, lib, makeWrapper, shellcheck, glibcLocales, coreutils, gettext, jq, omnia, ssb-server, oracle-suite, tor, keeman }:
 stdenv.mkDerivation rec {
   name = "install-relay-${version}";
   version = lib.fileContents ../version;
   src = ./.;
 
-  passthru.runtimeDeps = [ coreutils gettext jq ];
+  passthru.runtimeDeps = [ coreutils gettext jq keeman ];
   nativeBuildInputs = [ makeWrapper shellcheck ];
 
   buildPhase = "true";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p $out/{bin,share}
     cp -t $out/bin install-relay
-    cp -t $out/share *.service *.json *.ini ${omnia}/*.json
+    cp -t $out/share *.service *.json *.ini ${omnia}/config/*.json
 
     wrapProgram "$out/bin/install-relay" \
       --prefix PATH : "${path}" \

systemd/default.nix

@@ -206,16 +206,37 @@ copyTorConfig() {
 	sudo chmod u+w "${TORPROXY_CONFIG}" >&2
 
 	# shellcheck disable=SC2174
-	mkdir -m 0700 -p "$HOME"/.tor/{run,data} > /dev/null
-
-	sudo tee -a "${TORPROXY_CONFIG}" <<< "HiddenServiceDir ${HOME}/.tor"
-	sudo tee -a "${TORPROXY_CONFIG}" <<< "HiddenServicePort 8888 127.0.0.1:8800"
-	sudo tee -a "${TORPROXY_CONFIG}" <<< "HiddenServiceVersion 3"
+	mkdir -m 0700 -p "$HOME"/.tor/{run,data,srv} > /dev/null
+
+	if ! [[ -f "${HOME}/.tor/srv/hostname" ]]; then
+		local _HD_SEED
+		_HD_SEED="$(keeman gen -k 8)"
+		local _TOR_JSON
+		_TOR_JSON="$(keeman der -f onion <<<"$_HD_SEED")"
+		jq '.hostname' -r <<<"$_TOR_JSON" > "${HOME}/.tor/srv/hostname"
+		jq '.public_key' -r <<<"$_TOR_JSON" > "${HOME}/.tor/srv/$(jq '.prefix' -r <<<"$_TOR_JSON")_public_key"
+		jq '.secret_key' -r <<<"$_TOR_JSON" > "${HOME}/.tor/srv/$(jq '.prefix' -r <<<"$_TOR_JSON")_secret_key"
+
+		chmod 0600 "${HOME}/.tor/srv/"*
+
+		echo >&2
+		echo >&2
+		echo >&2 "----------------------------------------------------------------------------------------------------"
+		echo >&2 "Your key generation seed phrase is:"
+		echo >&2 "${_HD_SEED}"
+		echo >&2 "----------------------------------------------------------------------------------------------------"
+		echo >&2
+		echo >&2
+	fi
 
 	sudo tee -a "${TORPROXY_CONFIG}" <<< "ControlSocket ${HOME}/.tor/run/control"
 	sudo tee -a "${TORPROXY_CONFIG}" <<< "CookieAuthFile ${HOME}/.tor/run/control.authcookie"
 	sudo tee -a "${TORPROXY_CONFIG}" <<< "DataDirectory ${HOME}/.tor/data"
 
+	sudo tee -a "${TORPROXY_CONFIG}" <<< "HiddenServiceDir ${HOME}/.tor/srv"
+	sudo tee -a "${TORPROXY_CONFIG}" <<< "HiddenServicePort 8888 127.0.0.1:8800"
+	sudo tee -a "${TORPROXY_CONFIG}" <<< "HiddenServiceVersion 3"
+
 	echo >&2 "TORPROXY_CONFIG: DONE"
 }
 
@@ -379,8 +400,6 @@ done
 installConfigs
 installServices
 
-"$OMNIA_PATH" info
-
 echo >&2 "To (re)start Omnia now (and auto-start on reboot) run:"
 echo "systemctl daemon-reload # Reload systemd services"
 echo -n "$systemdCmd"