From 60a877c11569c12671aee258606925ba2d84a4f5 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige.mcwhirter@iohk.io>
Date: Thu, 30 Jul 2020 13:01:37 +1000
Subject: [PATCH] Bumped to mainnet in the Shelley era

---
 nix/sources.json       | 20 ++++++++++----------
 roles/cardano-node.nix |  5 ++---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 40c6a0c..43a9e53 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,22 +5,22 @@
         "homepage": "https://cardano.org",
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "46f296f8a9f3f497d9bd41e20c8398d2b5730c86",
-        "sha256": "05wv990vcg41sl68ii991fkgxp9fgcyig1asp94ig30xb1cg2zbl",
+        "rev": "9f1affce5d18ef3a44647e8de629c0852058b24b",
+        "sha256": "01nhxwrv1cgkav3fi09mrrcy31xqqdsxs41r9h7difrymg5asa15",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/46f296f8a9f3f497d9bd41e20c8398d2b5730c86.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/9f1affce5d18ef3a44647e8de629c0852058b24b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "daedalus": {
-        "branch": "refs/tags/1.1.0",
+        "branch": "refs/tags/2.0.0",
         "description": "The open source cryptocurrency wallet for ada, built to grow with the community",
         "homepage": "https://daedaluswallet.io/",
         "owner": "input-output-hk",
         "repo": "daedalus",
-        "rev": "25866a431aba60bf73aeb1a51f9134143145fa07",
-        "sha256": "1jwqm14fxzd8qglwyxm989rajfjnvjql1mbx135fl1sw75znd7ih",
+        "rev": "e6650b78e8a54ef0a96be6757156b0a1c40b1b8c",
+        "sha256": "0b5md3jfn209hsiann7b96jnsgjgj9bz1nparbbk5b4bw2iqhzgn",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/daedalus/archive/25866a431aba60bf73aeb1a51f9134143145fa07.tar.gz",
+        "url": "https://github.com/input-output-hk/daedalus/archive/e6650b78e8a54ef0a96be6757156b0a1c40b1b8c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -29,10 +29,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "f73bf8d584148677b01859677a63191c31911eae",
-        "sha256": "0jlmrx633jvqrqlyhlzpvdrnim128gc81q5psz2lpp2af8p8q9qs",
+        "rev": "ab9cc41caf44d1f1d465d8028e4bc0096fd73238",
+        "sha256": "17k52n8zwp832cqifsc4458mhy4044wmk22f807171hf6p7l4xvr",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/f73bf8d584148677b01859677a63191c31911eae.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/ab9cc41caf44d1f1d465d8028e4bc0096fd73238.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
diff --git a/roles/cardano-node.nix b/roles/cardano-node.nix
index a9674fd..2e6902c 100644
--- a/roles/cardano-node.nix
+++ b/roles/cardano-node.nix
@@ -14,7 +14,6 @@ in
   imports = [
     ../secrets/cardano.nix
     ../secrets/cardano/producers.nix
-    ./prometheus_cardano-node.nix
     "${sources.cardano-node}/nix/nixos"
   ];
 
@@ -25,9 +24,9 @@ in
   services = {
     cardano-node = {
       enable = true;
-      environment = "ff";
+      environment = "mainnet";
       hostAddr = "0.0.0.0";
-      nodeConfig = config.services.cardano-node.environments.alpha1.nodeConfig // {
+      nodeConfig = config.services.cardano-node.environments.mainnet.nodeConfig // {
         hasPrometheus = [ "127.0.0.1" 12798 ];
         setupScribes = [{
           scKind = "JournalSK";