From 4a5f0c5848c10289a78f9cc39d842283d31f7add Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Tue, 18 Apr 2023 22:51:21 +0200 Subject: [PATCH 01/12] Fix build of ouroboros-consensus Seems like it broke because a more recent version of unix-bytestring became available and the original package (as in the CHaP index-state provided) was not having an upper bound. Should also try more recent index states instead. closes #114 co-authored-by: KtorZ --- cabal.project | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 6e92c7d9..7c51c891 100644 --- a/cabal.project +++ b/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 From 78886b785ba5eea8edf8c93ce701eb7a79a9713c Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 19 Apr 2023 08:39:45 +0200 Subject: [PATCH 02/12] Remove now obsolete regression test Support for v1.0.1 is no longer required. Fixes #115. --- test/Test/Kupo/App/HttpSpec.hs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/Test/Kupo/App/HttpSpec.hs b/test/Test/Kupo/App/HttpSpec.hs index 36d325b7..4f8bacd7 100644 --- a/test/Test/Kupo/App/HttpSpec.hs +++ b/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" From 3992728c0160de310a8b8b504e11432a7ddd4a6a Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 19 Apr 2023 08:43:28 +0200 Subject: [PATCH 03/12] Fix database query inspection for matching by policyId Now that there's a proper index on policy id, there's no need to keep the little 'hack' on output reference range in. Note that this is an oversight from: b4126d2 --- test/Test/Kupo/Data/DatabaseSpec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Test/Kupo/Data/DatabaseSpec.hs b/test/Test/Kupo/Data/DatabaseSpec.hs index 8ecc61ad..67247263 100644 --- a/test/Test/Kupo/Data/DatabaseSpec.hs +++ b/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=?)" ] ) From 924e7fa1778ef238306a4226ce9061d7d40d1429 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 19 Apr 2023 08:45:40 +0200 Subject: [PATCH 04/12] Bump 'install-nix-action' workflow version See: https://github.com/cachix/cachix-action/issues/144 --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2b1df2f0..f5850714 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build +me: Build on: pull_request: @@ -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: | From bab01be5d73bcf13f5b3f645547d93bcb6512686 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 19 Apr 2023 08:55:19 +0200 Subject: [PATCH 05/12] Use local configuration for development --- Makefile | 5 ++--- config | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bdedb2d5..2ea9ebc1 100644 --- a/Makefile +++ b/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) diff --git a/config b/config index 36a75a92..9c1ceaf6 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 36a75a920de312519c3a9086061daccb997f9cd0 +Subproject commit 9c1ceaf666f1b6492d8d02d71be881f07a6a0245 From 22e511571c3a33fde979d0f0c28d70a04ea9fb6d Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 19 Apr 2023 08:57:01 +0200 Subject: [PATCH 06/12] Fix log ANSI colors in TTY terminals --- src/Kupo/Control/MonadLog.hs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Kupo/Control/MonadLog.hs b/src/Kupo/Control/MonadLog.hs index 27cc3e3d..d217d125 100644 --- a/src/Kupo/Control/MonadLog.hs +++ b/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 ) From bc5fc59580fc49700e6729161c747b710bfd4fcc Mon Sep 17 00:00:00 2001 From: Sourabh Date: Thu, 22 Jun 2023 14:15:13 +0530 Subject: [PATCH 07/12] Updated link to Marconi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ae0f879..17857fda 100644 --- a/README.md +++ b/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.

- Learn more + Learn more

From d72d524b9c074699a171b65b649ab5f7dfe1fcb0 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 19 Apr 2023 09:28:35 +0200 Subject: [PATCH 08/12] remove now obsolete test against decommissioned (catastrophically broken) testnet. --- test/Test/Kupo/App/ConfigurationSpec.hs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/Test/Kupo/App/ConfigurationSpec.hs b/test/Test/Kupo/App/ConfigurationSpec.hs index 8a996e84..e3cc2616 100644 --- a/test/Test/Kupo/App/ConfigurationSpec.hs +++ b/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 From 0d21673bf1fb0fc46ccf35342f85f5d4c92c9745 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Thu, 29 Jun 2023 15:17:04 +0200 Subject: [PATCH 09/12] Oversight, fix invalid workflow name. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f5850714..04179cb5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,4 @@ -me: Build +name: Build on: pull_request: From c767d60c0174a228842aae5890ff3f9394287d52 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Thu, 29 Jun 2023 15:19:58 +0200 Subject: [PATCH 10/12] Fill-in CHANGELOG for 2.4.1 --- CHANGELOG.md | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 102f4b8c..2efa01a3 100644 --- a/CHANGELOG.md +++ b/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 From ad0b72357e4b7b8638720c6d4d7b0e98f58475e1 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Thu, 29 Jun 2023 15:21:46 +0200 Subject: [PATCH 11/12] Bump API docs to 2.4.1 --- docs/api/{v2.4.0.yaml => v2.4.1.yaml} | 2 +- docs/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename docs/api/{v2.4.0.yaml => v2.4.1.yaml} (99%) diff --git a/docs/api/v2.4.0.yaml b/docs/api/v2.4.1.yaml similarity index 99% rename from docs/api/v2.4.0.yaml rename to docs/api/v2.4.1.yaml index 05726bb3..d8256c9b 100644 --- a/docs/api/v2.4.0.yaml +++ b/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 diff --git a/docs/index.html b/docs/index.html index ba36d50a..c3647efc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -127,7 +127,7 @@
v2.3.4 - v2.4.0 + v2.4.1 nightly