From 20d6c26dfa00f98733ded0416e00b31dafb14b91 Mon Sep 17 00:00:00 2001 From: Kostas Dermentzis Date: Mon, 21 Oct 2024 13:27:57 +0300 Subject: [PATCH] Integrate node-10 --- CHANGELOG.md | 8 ++++++++ cabal.project | 8 ++++---- cardano-chain-gen/cardano-chain-gen.cabal | 4 ++-- cardano-db-sync/cardano-db-sync.cabal | 4 ++-- cardano-db-tool/cardano-db-tool.cabal | 2 +- cardano-db/cardano-db.cabal | 2 +- cardano-db/test/cardano-db-test.cabal | 2 +- cardano-smash-server/cardano-smash-server.cabal | 2 +- doc/schema.md | 1 - docker-compose.yml | 4 ++-- flake.lock | 12 ++++++------ 11 files changed, 28 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f88ca621..cc437163e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Revision history for cardano-db-sync +## 13.6.0.0 +- A new config `use_address_table` addition makes it possible to use a separate table for addresses [#1697] +- Support application/ld+json http mime type for vote metadata [#1842] +- Support fetching from ipfs, using a new config `ipfs_gateway` [#1792] +- Fix an issue with drep metadata images [#1857] +- Fix an issue with pool_stat [#1833] + + ## 13.5.0.2 - Fix an issue with restarts - Fix an issue with --disable-cache not working properly [#1838] diff --git a/cabal.project b/cabal.project index 941d8e2b8..eea5bef0e 100644 --- a/cabal.project +++ b/cabal.project @@ -10,8 +10,8 @@ repository cardano-haskell-packages d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee index-state: - , hackage.haskell.org 2024-09-10T19:44:01Z - , cardano-haskell-packages 2024-09-06T13:43:41Z + , hackage.haskell.org 2024-10-10T00:52:24Z + , cardano-haskell-packages 2024-10-17T12:07:57Z packages: cardano-db @@ -84,8 +84,8 @@ constraints: source-repository-package type: git location: https://github.com/IntersectMBO/cardano-node - tag: efd560070aaf042d1eb4680ae37fc607c7742319 - --sha256: sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc= + tag: cdb45dd5aa9b4cf43ef6a6c8ecd5b6afbef953e4 + --sha256: sha256-YFq/0HGlWqzij+9hOoXNhDHFH+5ltpMph8mmI4O8qeE= subdir: cardano-node cardano-submit-api diff --git a/cardano-chain-gen/cardano-chain-gen.cabal b/cardano-chain-gen/cardano-chain-gen.cabal index 5e6840b9f..84582d173 100644 --- a/cardano-chain-gen/cardano-chain-gen.cabal +++ b/cardano-chain-gen/cardano-chain-gen.cabal @@ -1,7 +1,7 @@ cabal-version: 3.6 name: cardano-chain-gen -version: 13.5.0.2 +version: 13.6.0.0 synopsis: A fake chain generator for testing cardano DB sync. description: A fake chain generator for testing cardano DB sync. homepage: https://github.com/IntersectMBO/cardano-db-sync @@ -95,7 +95,7 @@ library , ouroboros-network-framework , ouroboros-network-protocols , plutus-core - , plutus-ledger-api:{plutus-ledger-api-testlib} ==1.30.0.0 + , plutus-ledger-api:{plutus-ledger-api-testlib} , serialise , strict-sop-core , strict-stm diff --git a/cardano-db-sync/cardano-db-sync.cabal b/cardano-db-sync/cardano-db-sync.cabal index 4814fab51..aae2fcd8e 100644 --- a/cardano-db-sync/cardano-db-sync.cabal +++ b/cardano-db-sync/cardano-db-sync.cabal @@ -1,7 +1,7 @@ cabal-version: 3.6 name: cardano-db-sync -version: 13.5.0.2 +version: 13.6.0.0 synopsis: The Cardano DB Sync node description: A Cardano node that follows the Cardano chain and inserts data from the chain into a PostgresQL database. @@ -209,7 +209,7 @@ library , ouroboros-network-protocols , persistent , persistent-postgresql - , plutus-ledger-api ==1.30.0.0 + , plutus-ledger-api , pretty-show , prometheus , psqueues diff --git a/cardano-db-tool/cardano-db-tool.cabal b/cardano-db-tool/cardano-db-tool.cabal index 187970132..13fbfcecb 100644 --- a/cardano-db-tool/cardano-db-tool.cabal +++ b/cardano-db-tool/cardano-db-tool.cabal @@ -1,7 +1,7 @@ cabal-version: 3.6 name: cardano-db-tool -version: 13.5.0.2 +version: 13.6.0.0 synopsis: Utilities to manage the cardano-db-sync databases. description: Utilities and executable, used to manage and validate the PostgreSQL db and the ledger database of the cardano-db-sync node diff --git a/cardano-db/cardano-db.cabal b/cardano-db/cardano-db.cabal index e10834359..f1f8e4bd5 100644 --- a/cardano-db/cardano-db.cabal +++ b/cardano-db/cardano-db.cabal @@ -1,7 +1,7 @@ cabal-version: 3.6 name: cardano-db -version: 13.5.0.2 +version: 13.6.0.0 synopsis: A base PostgreSQL component for the cardano-db-sync node. description: Code for the Cardano DB Sync node that is shared between the cardano-db-node and other components. diff --git a/cardano-db/test/cardano-db-test.cabal b/cardano-db/test/cardano-db-test.cabal index 7a3d66b9a..5cc89e69e 100644 --- a/cardano-db/test/cardano-db-test.cabal +++ b/cardano-db/test/cardano-db-test.cabal @@ -1,7 +1,7 @@ cabal-version: 3.6 name: cardano-db-test -version: 13.5.0.2 +version: 13.6.0.0 synopsis: Tests for the base functionality of the cardano-db library description: Code for the Cardano DB Sync node that is shared between the cardano-db-node and other components. diff --git a/cardano-smash-server/cardano-smash-server.cabal b/cardano-smash-server/cardano-smash-server.cabal index e70523e8e..ecf04216b 100644 --- a/cardano-smash-server/cardano-smash-server.cabal +++ b/cardano-smash-server/cardano-smash-server.cabal @@ -1,7 +1,7 @@ cabal-version: 3.6 name: cardano-smash-server -version: 13.5.0.2 +version: 13.6.0.0 synopsis: The Cardano smash server description: Please see the README on GitHub at diff --git a/doc/schema.md b/doc/schema.md index 3556f17d5..14c6481bd 100644 --- a/doc/schema.md +++ b/doc/schema.md @@ -1,6 +1,5 @@ # Schema Documentation for cardano-db-sync -Schema version: 13.5.0.2 (from branch **1870-variant-collateral-txout** which may not accurately reflect the version number) **Note:** This file is auto-generated from the documentation in cardano-db/src/Cardano/Db/Schema/BaseSchema.hs by the command `cabal run -- gen-schema-docs doc/schema.md`. This document should only be updated during the release process and updated on the release branch. ### `schema_version` diff --git a/docker-compose.yml b/docker-compose.yml index 8e41a3724..3a1286e45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: max-file: "10" cardano-node: - image: ghcr.io/intersectmbo/cardano-node:9.1.1 + image: ghcr.io/intersectmbo/cardano-node:10.0.0-pre environment: - NETWORK=${NETWORK:-mainnet} volumes: @@ -54,7 +54,7 @@ services: max-file: "10" cardano-db-sync: - image: ghcr.io/intersectmbo/cardano-db-sync:13.5.0.2 + image: ghcr.io/intersectmbo/cardano-db-sync:13.6.0.0 environment: - DB_SYNC_CONFIG=${DB_SYNC_CONFIG:-} - DISABLE_LEDGER=${DISABLE_LEDGER} diff --git a/flake.lock b/flake.lock index 7310bbea1..0fd8cc306 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1725978043, - "narHash": "sha256-3AwgQ308g74rISxUlbzQRX3At0trVoH836vBwkcFFYg=", + "lastModified": 1729492933, + "narHash": "sha256-XuwElZKFRhXXuJtT7KUZcCb5QCr0cFQ60ukhPgX8N50=", "owner": "IntersectMBO", "repo": "cardano-haskell-packages", - "rev": "ce5ba82d474225506523e66a4050718de7e2b3fe", + "rev": "a36ff9eec592a38e9a23521079dbe41684ff9b51", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1726014807, - "narHash": "sha256-a1Vf++zjoFgSYl8ahl7qOwuQtDgn9bFDhr1T2rxqED4=", + "lastModified": 1729470551, + "narHash": "sha256-AKBK4jgOjIz5DxIsIKFZR0mf30qc4Dv+Dm/DVRjdjD8=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "45251f373aeb0db77d1e3e89e26b3bebd7897dca", + "rev": "ee5b803d828db6efac3ef7e7e072c855287dc298", "type": "github" }, "original": {