Merge pull request #1878 from IntersectMBO/kderme/node-10

Integrate node-10

Author: kderme

CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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]
+- Expect pool_stat instead of pool_stats in config [#1880]
+
+
 ## 13.5.0.2
 - Fix an issue with restarts
 - Fix an issue with --disable-cache not working properly [#1838]

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-22T13:53:49Z
 
 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

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

cardano-chain-gen/test/Test/Cardano/Db/Mock/Property/Property.hs

@@ -286,7 +286,7 @@ sm interpreter mockServer dbSync =
 prop_empty_blocks :: IOManager -> [(Text, Text)] -> Property
 prop_empty_blocks iom knownMigrations = withMaxSuccess 20 $ noShrinking $ forAllCommands smSymbolic (Just 20) $ \cmds -> monadicIO $ do
   (hist, res) <- run $ runAction $ \interpreter mockServer dbSync -> do
-    (hist, _model, res) <- runCommands' (pure $ sm interpreter mockServer dbSync) cmds
+    (hist, _model, res) <- runCommands' (sm interpreter mockServer dbSync) cmds
     pure (hist, res)
   prettyCommands smSymbolic hist (checkCommandNames cmds (res === Ok))
   where

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Governance.hs

@@ -71,7 +71,7 @@ drepDistr =
 
 newCommittee :: IOManager -> [(Text, Text)] -> Assertion
 newCommittee =
-  withFullConfig conwayConfigDir testLabel $ \interpreter server dbSync -> do
+  withFullConfigAndLogs conwayConfigDir testLabel $ \interpreter server dbSync -> do
     startDBSync dbSync
 
     -- Add stake
@@ -118,7 +118,7 @@ newCommittee =
     assertEqQuery
       dbSync
       Query.queryGovActionCounts
-      (1, 1, 1, 0)
+      (1, 1, 0, 0)
       "Unexpected committee hashes"
   where
     testLabel = "conwayNewCommittee"
@@ -187,7 +187,7 @@ updateConstitution =
 
 treasuryWithdrawal :: IOManager -> [(Text, Text)] -> Assertion
 treasuryWithdrawal =
-  withFullConfig conwayConfigDir testLabel $ \interpreter server dbSync -> do
+  withFullConfigAndLogs conwayConfigDir testLabel $ \interpreter server dbSync -> do
     startDBSync dbSync
 
     -- Add stake

cardano-chain-gen/test/testfiles/fingerprint/bigChain

@@ -1 +1 @@
-[28,42,43,52,62,82,92,106,109,133,161,162,171,195,196,197,206,208,216,222,272,275,282,347,382,392,393,398,414,424,446,448,465,478,485,499,500,506,508,509,513,514,515,518,539,548,566,577,584,589,602,613,626,644,661,664,668,677,725,729,736,746,749,757,773,774,784,810,813,819,828,849,852,866,876,880,886,895,900,924,930,952,964,971,981,987,989,1013,1016,1027,1058,1064,1082,1098,1110,1121,1159,1205,1221,1226,1235,1246,1264,1266,1352,1355,1366,1380,1395,1422,1423,1502,1509,1515,1523,1574,1575,1576,1611,1656,1665,1697,1698,1739,1758,1765,1783,1784,1798,1799,1805,1820,1823,1824,1830,1833,1853,1884,1955,1999,2045,2080,2109,2190,2205,2209,2234,2256,2285,2294,2301,2378,2381,2382,2389,2390,2399,2427,2466,2495,2540,2547,2549,2573,2581,2629,2630,2673,2674,2681,2688,2729,2736,2759,2762,2793,2809,2835,2840,2851,2887,2899,2901,2934,2961,2968,3008,3040,3056,3059,3065,3067,3089,3119,3128,3129,3137,3154,3165,3194,3212,3216,3220,3222,3234,3236]
+[28,42,43,52,62,82,92,106,109,133,161,162,171,195,196,197,206,208,216,222,272,275,282,347,382,392,393,398,414,424,446,448,465,478,485,499,500,506,508,509,513,514,515,518,539,548,566,577,584,589,602,613,626,644,661,664,668,677,725,729,736,746,749,757,773,774,784,810,813,819,828,849,852,866,876,880,886,895,900,924,930,952,964,971,981,987,989,1001,1005,1012,1025,1026,1041,1046,1060,1071,1076,1079,1101,1119,1140,1144,1166,1181,1191,1205,1212,1250,1260,1263,1265,1308,1346,1370,1398,1409,1433,1441,1457,1477,1511,1527,1603,1645,1652,1710,1714,1721,1773,1803,1816,1818,1843,1879,1896,1897,1914,1923,1926,1940,1950,1963,1968,1972,1999,2002,2009,2021,2030,2043,2050,2051,2057,2067,2092,2106,2128,2157,2170,2206,2224,2273,2319,2346,2382,2387,2392,2394,2397,2437,2443,2475,2511,2531,2547,2582,2609,2615,2632,2662,2666,2686,2699,2706,2741,2744,2748,2756,2773,2809,2849,2850,2853,2856,2862,2876,2914,2937,2958,2990,3053,3066,3084,3085,3086,3092]

cardano-chain-gen/test/testfiles/fingerprint/configBootstrapRestartMissingFlag

@@ -1 +1 @@
-[5,11,15,21,22,23,28,33,34,36,42,43,48,52,62,82,88,92,102,106,109,111,116,133,134,143,151,153,157,161,162,171,182,183,193,195,196,197,200,206,208,216,219,222,238,245,250,262,271,272,275,282,286,296,301,310,311,314,325,340,347,354,355,365,376,379,382,384,389,390,391,392,393,398,404,407,414,418,419,422,424,446,448,450,457,465,476,478,485,486,488,499,503,506,509,512,515,518,524,526,527,527,530,541,542,549,556,561,570,576,578,579,583,589,596,597,609,611,615,620,621,627,633,634,644,650,651,654,661,671,675,680,682,687,694,698,703,705,711,716,718,726,728,730,739,748,749,757,761,782,784,785,791,796,798,815,818,823,837,845,846,847,858,862,865,877,879,881,882,884,885,888,890,892,893,895,898,900,904,908,916,921,922,923,929,930,932,934,936,950,956,957,968,969,985,992,993,994,1013,1021,1024,1031,1036,1041]
+[5,11,15,21,22,23,28,33,34,36,42,43,48,52,62,82,88,92,102,106,109,111,116,133,134,143,151,153,157,161,162,171,182,183,193,195,196,197,200,206,208,216,219,222,238,245,250,262,271,272,275,282,286,296,301,310,311,314,325,340,347,354,355,365,376,379,382,384,389,390,391,392,393,398,404,407,414,418,419,422,424,446,448,450,457,465,476,478,485,486,488,499,503,506,509,512,515,518,524,526,527,527,530,541,542,549,556,561,570,576,578,579,583,589,596,597,609,611,615,620,621,627,633,634,644,650,651,654,661,671,675,680,682,687,694,698,703,705,711,716,718,726,728,730,739,748,749,757,761,782,784,785,791,796,798,815,818,823,837,845,846,847,858,862,865,877,879,881,882,884,885,888,890,892,893,895,898,900,904,908,916,921,922,923,929,930,932,934,936,950,956,957,968,969,985,992,993,994,1009,1011,1022,1025,1027,1033]

cardano-chain-gen/test/testfiles/fingerprint/configMigrateAndPruneRestart

@@ -1 +1 @@
-[5,11,15,21,22,23,28,33,34,36,42,43,48,52,62,82,88,92,102,106,109,111,116,133,134,143,151,153,157,161,162,171,182,183,193,195,196,197,200,206,208,216,219,222,238,245,250,262,271,272,275,282,286,296,301,310,311,314,325,340,347,354,355,365,376,379,382,384,389,390,391,392,393,398,404,407,414,418,419,422,424,446,448,450,457,465,476,478,485,486,488,499,503,506,509,512,515,518,524,526,527,530,541,542,549,556,561,570,576,578,579,583,589,596,597,609,611,615,620,621,627,633,634,644,650,651,654,661,671,675,680,682,687,694,698,703,705,711,716,718,726,728,730,739,748,749,757,761,782,784,785,791,796,798,815,818,823,837,845,846,847,858,862,865,877,879,881,882,884,885,888,890,892,893,895,898,900,904,908,916,921,922,923,929,930,932,934,936,950,956,957,968,969,985,992,993,994,1001,1003,1004,1009,1019,1026,1028,1031,1040,1043,1047,1051,1053]
+[5,11,15,21,22,23,28,33,34,36,42,43,48,52,62,82,88,92,102,106,109,111,116,133,134,143,151,153,157,161,162,171,182,183,193,195,196,197,200,206,208,216,219,222,238,245,250,262,271,272,275,282,286,296,301,310,311,314,325,340,347,354,355,365,376,379,382,384,389,390,391,392,393,398,404,407,414,418,419,422,424,446,448,450,457,465,476,478,485,486,488,499,503,506,509,512,515,518,524,526,527,530,541,542,549,556,561,570,576,578,579,583,589,596,597,609,611,615,620,621,627,633,634,644,650,651,654,661,671,675,680,682,687,694,698,703,705,711,716,718,726,728,730,739,748,749,757,761,782,784,785,791,796,798,815,818,823,837,845,846,847,858,862,865,877,879,881,882,884,885,888,890,892,893,895,898,900,904,908,916,921,922,923,929,930,932,934,936,950,956,957,968,969,985,992,993,994,1012,1015,1023,1037,1038,1042,1049,1052,1054,1056,1067,1068,1069]