From 56dbadd7b8c4939951c21511e3adb3a228bf69e5 Mon Sep 17 00:00:00 2001 From: Kostas Dermentzis Date: Fri, 8 Nov 2024 11:55:54 +0200 Subject: [PATCH 1/2] Update to node-10.1.2 --- CHANGELOG.md | 4 ++-- cabal.project | 2 +- cardano-chain-gen/cardano-chain-gen.cabal | 2 +- cardano-db-sync/cardano-db-sync.cabal | 2 +- cardano-db-tool/cardano-db-tool.cabal | 2 +- cardano-db/test/cardano-db-test.cabal | 2 +- cardano-smash-server/cardano-smash-server.cabal | 2 +- docker-compose.yml | 4 ++-- flake.lock | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4652a7b60..e47e1fe65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Revision history for cardano-db-sync -## 13.6.0.0 +## 13.6.0.1 - 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] @@ -8,7 +8,7 @@ - Fix an issue with pool_stat [#1833] - Expect pool_stat instead of pool_stats in config [#1880] - Enacted gov_action_proposal are no longer marked as dropped - +- Fix issue with `use_address_table` crashing on some networks. ## 13.5.0.2 - Fix an issue with restarts diff --git a/cabal.project b/cabal.project index 3729a70b2..13f4d0b2b 100644 --- a/cabal.project +++ b/cabal.project @@ -11,7 +11,7 @@ repository cardano-haskell-packages index-state: , hackage.haskell.org 2024-10-10T00:52:24Z - , cardano-haskell-packages 2024-10-22T13:53:49Z + , cardano-haskell-packages 2024-10-30T10:23:17Z packages: cardano-db diff --git a/cardano-chain-gen/cardano-chain-gen.cabal b/cardano-chain-gen/cardano-chain-gen.cabal index 84582d173..848e34403 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.6.0.0 +version: 13.6.0.1 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 diff --git a/cardano-db-sync/cardano-db-sync.cabal b/cardano-db-sync/cardano-db-sync.cabal index eb455b8fd..03f3b5e6f 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.6.0.0 +version: 13.6.0.1 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. diff --git a/cardano-db-tool/cardano-db-tool.cabal b/cardano-db-tool/cardano-db-tool.cabal index 13fbfcecb..f6693ac10 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.6.0.0 +version: 13.6.0.1 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/test/cardano-db-test.cabal b/cardano-db/test/cardano-db-test.cabal index 5cc89e69e..b10554945 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.6.0.0 +version: 13.6.0.1 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 ecf04216b..f737aed40 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.6.0.0 +version: 13.6.0.1 synopsis: The Cardano smash server description: Please see the README on GitHub at diff --git a/docker-compose.yml b/docker-compose.yml index 64887afcf..ad85a6d41 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:10.1.0-pre + image: ghcr.io/intersectmbo/cardano-node:10.1.2 environment: - NETWORK=${NETWORK:-mainnet} volumes: @@ -54,7 +54,7 @@ services: max-file: "10" cardano-db-sync: - image: ghcr.io/intersectmbo/cardano-db-sync:13.6.0.0-pre + image: ghcr.io/intersectmbo/cardano-db-sync:13.6.0.1 environment: - DB_SYNC_CONFIG=${DB_SYNC_CONFIG:-} - DISABLE_LEDGER=${DISABLE_LEDGER} diff --git a/flake.lock b/flake.lock index ed1b617ec..c927db706 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1729606144, - "narHash": "sha256-LhKDonlXqVtRArtg0RHgTkze0KZV+dQ/Xop/3dylUR8=", + "lastModified": 1730824761, + "narHash": "sha256-Kv99PeYWdqmj5OStnp6kE6fjHbx6irTYyEPoFuukfHU=", "owner": "IntersectMBO", "repo": "cardano-haskell-packages", - "rev": "05b6965b007cbcb275ff236416f14545ef991899", + "rev": "d3d36220528058f9a24cff43fc723e60f6a786ad", "type": "github" }, "original": { From d8ba62b4ff08cd41d5f10b48aa6c39c66a2aa560 Mon Sep 17 00:00:00 2001 From: Kostas Dermentzis Date: Fri, 8 Nov 2024 12:08:37 +0200 Subject: [PATCH 2/2] Fix Word64 in schema --- .../src/Cardano/Db/Schema/BaseSchema.hs | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cardano-db/src/Cardano/Db/Schema/BaseSchema.hs b/cardano-db/src/Cardano/Db/Schema/BaseSchema.hs index 06c68708b..51b939650 100644 --- a/cardano-db/src/Cardano/Db/Schema/BaseSchema.hs +++ b/cardano-db/src/Cardano/Db/Schema/BaseSchema.hs @@ -404,15 +404,15 @@ share ParamProposal epochNo Word64 Maybe sqltype=word31type key ByteString Maybe sqltype=hash28type - minFeeA Word64 Maybe sqltype=word64type - minFeeB Word64 Maybe sqltype=word64type - maxBlockSize Word64 Maybe sqltype=word64type - maxTxSize Word64 Maybe sqltype=word64type - maxBhSize Word64 Maybe sqltype=word64type + minFeeA DbWord64 Maybe sqltype=word64type + minFeeB DbWord64 Maybe sqltype=word64type + maxBlockSize DbWord64 Maybe sqltype=word64type + maxTxSize DbWord64 Maybe sqltype=word64type + maxBhSize DbWord64 Maybe sqltype=word64type keyDeposit DbLovelace Maybe sqltype=lovelace poolDeposit DbLovelace Maybe sqltype=lovelace - maxEpoch Word64 Maybe sqltype=word64type - optimalPoolCount Word64 Maybe sqltype=word64type + maxEpoch DbWord64 Maybe sqltype=word64type + optimalPoolCount DbWord64 Maybe sqltype=word64type influence Double Maybe -- sqltype=rational monetaryExpandRate Double Maybe -- sqltype=interval treasuryGrowthRate Double Maybe -- sqltype=interval @@ -453,10 +453,10 @@ share committeeMinSize DbWord64 Maybe sqltype=word64type committeeMaxTermLength DbWord64 Maybe sqltype=word64type - govActionLifetime Word64 Maybe sqltype=word64type + govActionLifetime DbWord64 Maybe sqltype=word64type govActionDeposit DbWord64 Maybe sqltype=word64type drepDeposit DbWord64 Maybe sqltype=word64type - drepActivity Word64 Maybe sqltype=word64type + drepActivity DbWord64 Maybe sqltype=word64type minFeeRefScriptCostPerByte Double Maybe -- sqltype=rational registeredTxId TxId noreference @@ -514,7 +514,7 @@ share committeeMinSize DbWord64 Maybe sqltype=word64type committeeMaxTermLength DbWord64 Maybe sqltype=word64type - govActionLifetime DbWord64 Maybe sqltype=word64type + govActionLifetime DbWord64 Maybe sqltype=word64type govActionDeposit DbWord64 Maybe sqltype=word64type drepDeposit DbWord64 Maybe sqltype=word64type drepActivity DbWord64 Maybe sqltype=word64type @@ -530,10 +530,10 @@ share PoolStat poolHashId PoolHashId noreference epochNo Word64 sqltype=word31type - numberOfBlocks Word64 sqltype=word64type - numberOfDelegators Word64 sqltype=word64type - stake Word64 sqltype=word64type - votingPower Word64 Maybe sqltype=word64type + numberOfBlocks DbWord64 sqltype=word64type + numberOfDelegators DbWord64 sqltype=word64type + stake DbWord64 sqltype=word64type + votingPower DbWord64 Maybe sqltype=word64type ExtraMigrations token Text