From 7f2c259ded5e7eb1fc599852c09fb8610bb8682b Mon Sep 17 00:00:00 2001
From: vvtran <viet.tran.vvt@googlemail.com>
Date: Mon, 13 Jun 2022 12:57:53 +0100
Subject: [PATCH 1/3] upgrade odc

---
 flake.lock | 25 +++++++++++++++++++++----
 flake.nix  |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index dc30ad182..455d7c77a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1525,19 +1525,21 @@
     "ogmios-datum-cache": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "unstable_nixpkgs": "unstable_nixpkgs"
       },
       "locked": {
-        "lastModified": 1652673546,
-        "narHash": "sha256-fd3UST7vjed7KLOrLsFD8/nP7YXhCAQ3ODFs5SjZ6SQ=",
+        "lastModified": 1655041544,
+        "narHash": "sha256-ZTftQtrivnugqHjsMrV0wxKLfnrDxSX0MXM1KUkf4R0=",
         "owner": "mlabs-haskell",
         "repo": "ogmios-datum-cache",
-        "rev": "dbff887d14122249352c1a853be05023f64a2664",
+        "rev": "54ad2964af07ea0370bf95c0fed71f60a778ead5",
         "type": "github"
       },
       "original": {
         "owner": "mlabs-haskell",
         "repo": "ogmios-datum-cache",
+        "rev": "54ad2964af07ea0370bf95c0fed71f60a778ead5",
         "type": "github"
       }
     },
@@ -1793,6 +1795,21 @@
         "type": "github"
       }
     },
+    "unstable_nixpkgs": {
+      "locked": {
+        "lastModified": 1655120009,
+        "narHash": "sha256-h4JQSaVUNnAhMgfqRl6ie2OO5v3vtmgISVzUTdT827g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "693d5359ee0bfc1de975845f3a9f8f81a7abc535",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "utils": {
       "locked": {
         "lastModified": 1623875721,
diff --git a/flake.nix b/flake.nix
index 7642b168b..8778afa8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
 
     # for the purescript project
     ogmios.url = "github:mlabs-haskell/ogmios";
-    ogmios-datum-cache.url = "github:mlabs-haskell/ogmios-datum-cache";
+    ogmios-datum-cache.url = "github:mlabs-haskell/ogmios-datum-cache/54ad2964af07ea0370bf95c0fed71f60a778ead5";
     # so named because we also need a different version of the repo below
     # in the server inputs and we use this one just for the `cardano-cli`
     # executables

From 74f2a2e15ff8519368d2ab94bf003afa76684462 Mon Sep 17 00:00:00 2001
From: vvtran <viet.tran.vvt@googlemail.com>
Date: Tue, 14 Jun 2022 08:08:02 +0100
Subject: [PATCH 2/3] Update nix files

---
 CHANGELOG.md | 1 +
 flake.nix    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc2128e23..5f04ad552 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 - Single `Plutus.Conversion` module exposing all `(Type <-> Plutus Type)` conversion functions.
 - Support for using a `PrivateKey` as a `Wallet`.
+- Upgraded `ogmios-datum-cache` to `54ad2964af07ea0370bf95c0fed71f60a778ead5` for more stable datum from datum hash.
 
 ### Removed
 
diff --git a/flake.nix b/flake.nix
index 8778afa8d..0390e8488 100644
--- a/flake.nix
+++ b/flake.nix
@@ -196,6 +196,7 @@
               "dbname=${postgres.db}"
               "password=${postgres.password}"
             ];
+          controlApiToken = "";
           blockFetcher = {
             firstBlock = {
               slot = 54066900;
@@ -318,6 +319,7 @@
                   datumCache.blockFetcher.filter;
                 configFile = ''
                   dbConnectionString = "${datumCache.dbConnectionString}"
+                  server.controlApiToken = "${toString datumCache.controlApiToken}"
                   server.port = ${toString datumCache.port}
                   ogmios.address = "ogmios"
                   ogmios.port = ${toString ogmios.port}

From 8663273ddedd71e31c9b1df367f482da2a5defed Mon Sep 17 00:00:00 2001
From: Rory Tyler Hayford <rory.hayford@protonmail.com>
Date: Wed, 15 Jun 2022 10:28:28 +0700
Subject: [PATCH 3/3] Add issue to changelog

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f04ad552..11bdef0d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,13 +10,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 - Single `Plutus.Conversion` module exposing all `(Type <-> Plutus Type)` conversion functions.
 - Support for using a `PrivateKey` as a `Wallet`.
-- Upgraded `ogmios-datum-cache` to `54ad2964af07ea0370bf95c0fed71f60a778ead5` for more stable datum from datum hash.
+- Upgraded `ogmios-datum-cache` to `54ad2964af07ea0370bf95c0fed71f60a778ead5` for more stable datum from datum hash (see [here](https://github.com/Plutonomicon/cardano-transaction-lib/issues/526) for more details).
 
 ### Removed
 
 - `FromPlutusType` / `ToPlutusType` type classes.
 
-
 ## [1.0.0] - 2022-06-10
 
 CTL's initial release!