Merge tag 'v2.4.1' into v2.4

v2.4.1

  #### Added

  N/A

  #### Changed

  - Fix ANSI colors of logs in TTY terminals

  - Fix internal dependency causing build issues for ouroboros-consensus

  #### Removed

  N/A

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
         submodules: true
 
     - name: ❄️  Install Nix
-      uses: cachix/install-nix-action@v18
+      uses: cachix/install-nix-action@v20
       with:
         nix_path: nixpkgs=channel:nixos-unstable
         extra_nix_config: |

CHANGELOG.md

@@ -1,4 +1,20 @@
-### [2.4.0] - 2022-02-23
+### [2.4.1] - 2023-06-29
+
+#### Added
+
+N/A
+
+#### Changed
+
+- Fix ANSI colors of logs in TTY terminals
+
+- Fix internal dependency causing build issues for ouroboros-consensus
+
+#### Removed
+
+N/A
+
+### [2.4.0] - 2023-02-23
 
 #### Added
 
@@ -35,7 +51,7 @@
 
 N/A
 
-### [2.3.4] - 2022-01-26
+### [2.3.4] - 2023-01-26
 
 #### Added
 
@@ -49,7 +65,7 @@ N/A
 
 N/A
 
-### [2.3.3] - 2022-01-23
+### [2.3.3] - 2023-01-23
 
 #### Added
 
@@ -63,7 +79,7 @@ N/A
 
 N/A
 
-### [2.3.2] - 2022-01-18
+### [2.3.2] - 2023-01-18
 
 #### Added
 
@@ -82,7 +98,7 @@ N/A
 N/A
 
 
-### [2.3.1] - 2022-01-09
+### [2.3.1] - 2023-01-09
 
 #### Added
 
@@ -113,7 +129,7 @@ N/A
 
 N/A
 
-### [2.3.0] - 2022-01-05
+### [2.3.0] - 2023-01-05
 
 #### Added
 

Makefile

@@ -4,9 +4,8 @@ OS := $(shell uname -s)
 ARCH := $(shell uname -m)
 VERSION := $(shell cat package.yaml| grep "version:" | sed "s/.*\([0-9]\)\(.[0-9].[0-9]\)*\(-.*\)*/\1\2\3/")
 STYLISH_HASKELL_VERSION := 0.13.0.0
-
-# replace with local setup
-CONFIG := /usr/local/share/cardano/network/preview
+NETWORK := preview
+CONFIG := $(shell pwd)/config/network/$(NETWORK)
 
 LD_LIBRARY_PATH := $(shell echo $$LD_LIBRARY_PATH | sed "s/:/ /g")
 LIBSODIUM := $(shell find $(LD_LIBRARY_PATH) -type file -name "*libsodium.*.dylib" | uniq)

README.md

@@ -115,7 +115,7 @@ Key difference(s): cardano-db-sync synchronizes ALL data from the Cardano blockc
 Key differences(s): In a similar fashion to Carp, Marconi offers a modular indexer infrastructure where users can customize data streams through standalone plugins (however written in Haskell). It synchronizes data across multiple streams (utxo, datums and scripts), filters them based on custom plugins and stores them in a SQLite database. At this stage, Marconi is also in at an early development phase.
 
 <p align="right">
-  <a href="https://github.com/input-output-hk/plutus-apps/tree/main/marconi#marconi">Learn more</a>
+  <a href="https://github.com/input-output-hk/marconi">Learn more</a>
 </p>
 </details>
 

cabal.project

@@ -10,7 +10,7 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state: 2022-09-27T00:00:00Z
-index-state: cardano-haskell-packages 2022-10-25T20:00:00Z
+index-state: cardano-haskell-packages 2022-10-25T23:59:59Z
 
 packages:
   ./
@@ -61,6 +61,7 @@ constraints:
   , resource-pool == 0.3.1.0
   , strict-containers == 0.1.0.0
   , systemd >= 2.3.0
+  , unix-bytestring == 0.3.7.8
   , word-array == 0.1.0.0
 
   -- Cardano packages

docs/api/v2.4.0.yaml → docs/api/v2.4.1.yaml

@@ -5,7 +5,7 @@ servers:
 
 info:
   title: Kupo
-  version: v2.4.0
+  version: v2.4.1
   license:
     name: MPL-2.0
     url: https://raw.githubusercontent.com/cardanosolutions/kupo/master/LICENSE

docs/index.html

@@ -127,7 +127,7 @@
 
   <div id="versions">
     <a href="#">v2.3.4</a>
-    <a href="#">v2.4.0</a>
+    <a href="#">v2.4.1</a>
     <a href="#">nightly</a>
     <script>
       ;[1,2,3].forEach(ix => {

package.yaml

@@ -1,7 +1,7 @@
 _config: !include ".hpack.config.yaml"
 
 name:                kupo
-version:             2.4.0
+version:             2.4.1
 stability:           stable
 github:              "cardanosolutions/kupo"
 license:             MPL-2.0

src/Kupo/Control/MonadLog.hs

@@ -183,7 +183,8 @@ mkAnsiEnvelop h _version threadId utcTimestamp (SomeMsg _ tracerName msg) = do
   where
     mkTime timestamp =
         mconcat
-        [ Ansi.whiteBg $ T.fromString (formatTime defaultTimeLocale "%X%3Q" timestamp) <> " "
+        [ Ansi.whiteBg $ Ansi.black $
+            T.fromString (formatTime defaultTimeLocale "%X%3Q" timestamp) <> " "
         , Ansi.white "\57520"
         ]
 
@@ -217,27 +218,27 @@ mkAnsiEnvelop h _version threadId utcTimestamp (SomeMsg _ tracerName msg) = do
 
     (severity, accent) = case getSeverityAnnotation msg of
         Debug ->
-            ( Ansi.whiteBg (Ansi.black "\57520" <> Ansi.bold (Ansi.black " + "))
+            ( Ansi.whiteBg (Ansi.black "\57520" <> Ansi.bold (Ansi.white " + "))
                 <> Ansi.white "\57520"
             , Ansi.white
             )
         Info ->
-            ( Ansi.blueBg (Ansi.black "\57520" <> Ansi.bold (Ansi.black " ℹ "))
+            ( Ansi.blueBg (Ansi.black "\57520" <> Ansi.bold (Ansi.white " ℹ "))
                 <> Ansi.blue "\57520"
             , Ansi.blue
             )
         Notice ->
-            ( Ansi.magentaBg (Ansi.black "\57520" <> Ansi.bold (Ansi.black " ★ "))
+            ( Ansi.magentaBg (Ansi.black "\57520" <> Ansi.bold (Ansi.white " ★ "))
                 <> Ansi.magenta "\57520"
             , Ansi.magenta
             )
         Warning ->
-            ( Ansi.yellowBg (Ansi.black "\57520" <> Ansi.bold (Ansi.black " ! "))
+            ( Ansi.yellowBg (Ansi.black "\57520" <> Ansi.bold (Ansi.white " ! "))
                 <> Ansi.yellow "\57520"
             , Ansi.yellow
             )
         Error ->
-            ( Ansi.redBg (Ansi.black "\57520" <> Ansi.bold (Ansi.black " ✖ "))
+            ( Ansi.redBg (Ansi.black "\57520" <> Ansi.bold (Ansi.white " ✖ "))
                 <> Ansi.red "\57520"
             , Ansi.red
             )

test/Test/Kupo/App/ConfigurationSpec.hs

@@ -37,9 +37,3 @@ spec = parallel $ do
             networkMagic  params `shouldBe` NetworkMagic 764824073
             systemStart   params `shouldBe` mkSystemStart 1506203091
             slotsPerEpoch params `shouldBe` EpochSlots 21600
-
-        specify "testnet" $ do
-            params <- parseNetworkParameters "./config/network/testnet/cardano-node/config.json"
-            networkMagic  params `shouldBe` NetworkMagic 1097911063
-            systemStart   params `shouldBe` mkSystemStart 1563999616
-            slotsPerEpoch params `shouldBe` EpochSlots 21600

test/Test/Kupo/App/HttpSpec.hs

@@ -148,15 +148,7 @@ spec = do
     specification <- runIO $ do
         Yaml.decodeFileThrow @IO @OpenApi "./docs/api/latest.yaml"
 
-    specificationV1_0_1 <- runIO $ do
-        Yaml.decodeFileThrow @IO @OpenApi "./docs/api/v1.0.1.yaml"
-
     parallel $ do
-        session specificationV1_0_1 get "/v1/health" $ \_ _ -> do
-            res <- Wai.request $ Wai.setPath Wai.defaultRequest "/v1/health"
-            res & Wai.assertStatus (Http.statusCode Http.status200)
-            pure (Json.Null, [])
-
         session specification get "/health" $ \assertJson endpoint -> do
             let schema = findSchema specification endpoint Http.status200
             res <- Wai.request $ Wai.setPath Wai.defaultRequest "/health"

test/Test/Kupo/Data/DatabaseSpec.hs

@@ -1116,7 +1116,7 @@ spec = parallel $ do
                         <$> fmap MatchPolicyId genPolicyId
                     )
                     (`shouldBe`
-                        [ "SEARCH policies USING INDEX policiesByPolicyId (policy_id=?) sqlite_autoindex_policies_1 (output_reference>?)"
+                        [ "SEARCH policies USING INDEX policiesByPolicyId (policy_id=?)"
                         , "SEARCH inputs USING INDEX inputsByOutputReference (output_reference=?)"
                         ]
                     )