From 6528596f4c59a44e43eff6630fd4f9e1947271cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Zaremba?=
 <6050167+teghnet@users.noreply.github.com>
Date: Fri, 24 Mar 2023 17:36:10 +0100
Subject: [PATCH] chore: [sc-1845] Release Feed v1.15 (#46)

---
 nix/sources.json      | 8 ++++----
 omnia/lib/feed.sh     | 2 +-
 omnia/lib/omnia.sh    | 3 +--
 systemd/default.nix   | 2 +-
 systemd/install-omnia | 4 +---
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 02005fb..27f95bb 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -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": {
diff --git a/omnia/lib/feed.sh b/omnia/lib/feed.sh
index b177cb6..5ce0163 100644
--- a/omnia/lib/feed.sh
+++ b/omnia/lib/feed.sh
@@ -95,7 +95,7 @@ constructMessage() {
 	# compose jq message arguments
 	_jqArgs=(
 		--arg assetPair "$_assetPair"
-		--arg version "$ORACLE_VERSION"
+		--arg version "$OMNIA_VERSION"
 		--arg price "$_price"
 		--arg priceHex "$_priceHex"
 		--arg time "$_time"
diff --git a/omnia/lib/omnia.sh b/omnia/lib/omnia.sh
index b3a27f8..99dcfb4 100644
--- a/omnia/lib/omnia.sh
+++ b/omnia/lib/omnia.sh
@@ -1,7 +1,6 @@
 #initialize environment
 initEnv () {
-	ORACLE_VERSION=${ORACLE_VERSION:-"0.0.0-unknown"}
-	OMNIA_VERSION="$(cat ../version)"
+	OMNIA_VERSION=${OMNIA_VERSION:-"0.0.0-unknown"}
 
 	#Load Global configuration
 	importEnv || exit 1
diff --git a/systemd/default.nix b/systemd/default.nix
index 7a18a18..e4b45b4 100644
--- a/systemd/default.nix
+++ b/systemd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p $out/{bin,share}
     cp -t $out/bin install-omnia
-    cp -t $out/share *.service *.json *.ini ${omnia}/*.json
+    cp -t $out/share *.service *.json *.ini ${omnia}/config/*.json
 
     wrapProgram "$out/bin/install-omnia" \
       --prefix PATH : "${path}" \
diff --git a/systemd/install-omnia b/systemd/install-omnia
index 5a3bdd1..825b687 100755
--- a/systemd/install-omnia
+++ b/systemd/install-omnia
@@ -381,10 +381,10 @@ copyTorConfig() {
 
 installConfigs() {
 	copyOmniaConf "feed-ethereum-mainnet.json"
+	copySplitterConf
 	copySsbConf
 	copySpireConf
 	copyTorConfig
-	copySplitterConf
 	copyGoferConf
 	copyLeelooConf
 }
@@ -614,8 +614,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"