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

Integrate node-10

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/configPruneAndRollBack

@@ -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/configPruneCorrectAmount

@@ -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]

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

@@ -1 +1 @@
-[1,3,4,7,8,9,10,11,14,30,31,33,34,35,40,42,44,61,62,74,76,82,85,88,89,93,95,102,104,106,111,114,120,123,141,143,146,149,158,170,171,178,186,190,198,201,207,209,210,221,223,227,245,249,250,259,260,265,272,276,283,284,294,296,301,305,306,311,312,317,318,321,322,325,331,333,337,339,345,347,348,350,365,375,377,379,382,391,394,401,407,411,413,415,424,428,445,453,467,469,471,474,487,489,490,492,497,498,515,519,520,524,528,529,530,531,554,557,567,568,575,576,597,603,615,616,631,637,640,641,643,650,654,656,657,662,668,676,678,688,694,695,698,700,701,702,703,716,725,727,729,730,732,733,738,747,750,771,774,777,778,780,785,796,798,799,805,808,819,821,822,827,831,833,835,838,841,844,847,848,858,859,860,863,864,872,875,889,906,912,913,914,917,942,943,945,948,950,952,954,955,959,967,971,980,981,983,993,997,1006,1008,1009,1013,1026,1047,1048,1051,1052,1055,1068,1072,1078,1081,1085,1094,1095,1109,1138,1140,1141,1145,1155,1159,1162,1169,1171,1173,1174,1175,1177,1178,1179,1183,1190,1192,1200,1204,1211,1221,1222,1227,1229,1247,1251,1261,1262,1263,1264,1265,1276,1279,1281,1284,1289,1290,1293,1298,1310,1318,1319,1320,1321,1328,1329,1334,1335,1355,1360,1363,1370,1381,1384,1391,1394,1403,1409,1412,1415,1416,1418,1420,1427,1429,1430,1439,1443,1450,1455,1462,1469,1471,1486,1491,1496,1503]
+[1,3,4,7,8,9,10,11,14,30,31,33,34,35,40,42,44,61,62,74,76,82,85,88,89,93,95,102,104,106,111,114,120,123,141,143,146,149,158,170,171,178,186,190,198,201,207,209,210,221,223,227,245,249,250,259,260,265,272,276,283,284,294,296,301,305,306,311,312,317,318,321,322,325,331,333,337,339,345,347,348,350,365,375,377,379,382,391,394,401,407,411,413,415,424,428,445,453,467,469,471,474,487,489,490,492,497,498,515,519,520,524,528,529,530,531,554,557,567,568,575,576,597,603,615,616,631,637,640,641,643,650,654,656,657,662,668,676,678,688,694,695,698,700,701,702,703,716,725,727,729,730,732,733,738,747,750,771,774,777,778,780,785,796,798,799,805,808,819,821,822,827,831,833,835,838,841,844,847,848,858,859,860,863,864,872,875,889,906,912,913,914,917,942,943,945,948,950,952,954,955,959,967,971,980,981,983,993,997,1002,1003,1006,1019,1027,1030,1038,1041,1047,1049,1050,1052,1053,1057,1058,1060,1064,1071,1072,1085,1089,1091,1094,1102,1111,1127,1134,1140,1141,1145,1146,1147,1150,1165,1170,1181,1184,1185,1186,1207,1208,1216,1221,1231,1238,1241,1259,1261,1272,1276,1279,1284,1294,1298,1309,1310,1313,1317,1323,1326,1328,1330,1334,1338,1339,1343,1353,1358,1374,1386,1388,1391,1398,1403,1407,1409,1420,1421,1422,1427,1435,1436,1438,1443,1445,1446,1448,1468,1469,1483,1485,1486,1493,1494,1496,1501]

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

@@ -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,1013,1021]
+[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,1009,1011]

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

@@ -1 +1 @@
-[0,2,3,12,14,22,32,34,36,38,43,49,55,57,59,67,73,76,77,89,91,97,106,111,116,117,133,136,140,146,150,161,162,169,179,180,186,187,194,205,210,212,215,216,220,223,229,230,234,236,238,248,249,253,254,259,270,278,282,283,284,294,297,302,315,319,326,332,333,349,359,362,364,374,376,377,380,381,382,398,405,410,415,417,421,424,430,431,436,440,442,443,449,451,458,459,461,464,466,472,473,479,487,489,490,501,502,536,538,548,551,555,556,561,564,565,577,580,582,585,588,590,591,600,606,616,618,625,644,646,665,668,673,677,685,695,703,721,724,731,736,737,741,743,750,754,761,763,774,779,781,784,789,798,801,813,817,818,821,828,829,838,839,852,856,870,885,887,888,893,915,925,930,932,933,939,944,946,955,958,962,965,989,994,995,1002,1003,1007,1008,1011,1012,1021,1039,1041,1045,1047,1050,1053,1058,1059,1061,1065,1067,1068,1071,1072,1078,1080,1083,1085,1088,1092,1094,1106,1109,1115,1117,1120,1122,1128,1129,1132,1134,1145,1150,1151,1163,1165,1166,1175,1177,1178,1186,1187,1188,1193,1198,1205,1214,1218,1219,1221,1222,1223,1229,1232,1234,1241,1244,1248,1252,1253,1256,1261,1266,1268,1269,1272,1280,1284,1287,1292,1298,1301,1311,1314,1319,1332,1334,1337,1341,1346,1355,1356,1362,1369,1371,1373,1377,1382,1388,1391,1397,1400,1408,1413,1415,1416,1417,1424,1439,1443,1448,1452,1471,1474,1484,1486,1488,1495,1498,1501,1506,1514,1516,1524,1528,1532,1537,1538,1540,1542,1546,1548,1549,1554,1556,1566,1567,1574,1577,1578,1582,1584,1589,1593,1602,1611,1614,1619,1621,1622,1624,1626,1627,1640,1659,1660,1663,1686,1691,1699,1700,1705,1711,1714,1716,1717,1719,1739,1740,1744,1747,1749,1751,1754,1759,1763,1768,1770,1777,1792,1795,1797,1802,1808,1815,1816,1817,1824,1825,1826,1827,1831,1837,1843,1846,1856,1859,1860,1868,1869,1877,1879,1882,1888,1890,1893,1899,1901,1906,1907,1914,1917,1922,1924,1925,1927,1933,1938,1942,1944,1948,1950,1954,1966,1968,1973,1974,1976,1980,1985,1989,1992,1994,2004,2012,2020,2021,2022,2027,2032,2046,2064,2065,2073,2074,2075,2083,2085,2092,2097,2101,2109,2119,2120,2127,2135,2140,2141,2143,2148,2154,2156,2163,2164,2166,2168,2170,2171,2178,2187,2191,2194,2196,2202,2215,2216,2219,2226,2227,2229,2236,2239,2241,2266,2270,2275,2278,2284,2289,2291,2292,2293,2306,2314,2326,2336,2338,2342,2344,2345,2347,2349,2350,2351,2364,2367,2376,2383,2387,2389,2392,2396,2399,2402,2405,2408,2413,2415,2416,2417,2420,2422,2434,2442,2445,2446,2451,2458,2469,2487,2497,2511]
+[0,2,3,12,14,22,32,34,36,38,43,49,55,57,59,67,73,76,77,89,91,97,106,111,116,117,133,136,140,146,150,161,162,169,179,180,186,187,194,205,210,212,215,216,220,223,229,230,234,236,238,248,249,253,254,259,270,278,282,283,284,294,297,302,315,319,326,332,333,349,359,362,364,374,376,377,380,381,382,398,405,410,415,417,421,424,430,431,436,440,442,443,449,451,458,459,461,464,466,472,473,479,487,489,490,501,502,536,538,548,551,555,556,561,564,565,577,580,582,585,588,590,591,600,606,616,618,625,644,646,665,668,673,677,685,695,703,721,724,731,736,737,741,743,750,754,761,763,774,779,781,784,789,798,801,813,817,818,821,828,829,838,839,852,856,870,885,887,888,893,915,925,930,932,933,939,944,946,955,958,962,965,989,994,995,1016,1018,1025,1036,1041,1045,1065,1066,1074,1091,1094,1097,1098,1099,1101,1102,1104,1109,1111,1116,1126,1129,1132,1134,1137,1139,1143,1152,1169,1178,1185,1186,1188,1192,1205,1206,1210,1215,1217,1225,1235,1236,1241,1251,1261,1262,1263,1267,1268,1274,1287,1292,1297,1301,1314,1315,1319,1320,1322,1328,1329,1333,1335,1340,1346,1347,1350,1351,1352,1356,1357,1367,1369,1371,1373,1375,1382,1393,1406,1408,1418,1419,1424,1439,1441,1446,1449,1453,1456,1462,1484,1486,1488,1504,1505,1508,1509,1513,1514,1515,1516,1518,1521,1531,1537,1542,1546,1549,1550,1555,1557,1566,1577,1580,1583,1584,1586,1587,1592,1594,1597,1598,1607,1608,1611,1614,1622,1625,1626,1644,1646,1647,1678,1691,1694,1704,1705,1708,1716,1717,1720,1722,1729,1741,1746,1747,1749,1754,1755,1761,1767,1771,1773,1778,1779,1783,1787,1791,1798,1810,1813,1816,1821,1823,1825,1827,1838,1839,1842,1873,1882,1884,1887,1888,1889,1897,1907,1911,1914,1918,1920,1921,1922,1937,1948,1949,1952,1955,1957,1964,1965,1969,1973,1978,1986,1991,1995,2000,2003,2005,2007,2017,2019,2028,2034,2037,2060,2069,2072,2073,2076,2077,2088,2098,2106,2108,2127,2128,2129,2133,2144,2146,2147,2153,2155,2165,2197,2199,2219,2223,2227,2239,2251,2257,2258,2266,2273,2277,2280,2284,2288,2294,2295,2300,2301,2308,2324,2326,2335,2339,2340,2348,2353,2356,2361,2370,2371,2376,2386,2390,2398,2407,2410,2414,2418,2419,2424,2428,2429,2434,2437,2443,2446,2456,2464,2467,2475,2480,2481,2483,2484,2497,2500]

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

@@ -1 +1 @@
-[1,3,4,7,8,9,10,11,14,30,31,33,34,35,40,42,44,61,62,74,76,82,85,88,89,93,95,102,104,106,111,114,120,123,141,143,146,149,158,170,171,178,186,190,198,201,207,209,210,221,223,227,245,249,250,259,260,265,272,276,283,284,294,296,301,305,306,311,312,317,318,321,322,325,331,333,337,339,345,347,348,350,365,375,377,379,382,391,394,401,407,411,413,415,424,428,445,453,467,469,471,474,487,489,490,492,497,498,515,519,520,524,528,529,530,531,554,557,567,568,575,576,597,603,615,616,631,637,640,641,643,650,654,656,657,662,668,676,678,688,694,695,698,700,701,702,703,716,725,727,729,730,732,733,738,747,750,771,774,777,778,780,785,796,798,799,805,808,819,821,822,827,831,833,835,838,841,844,847,848,858,859,860,863,864,872,875,889,906,912,913,914,917,942,943,945,948,950,952,954,955,959,967,971,980,981,983,993,997,1006,1008]
+[1,3,4,7,8,9,10,11,14,30,31,33,34,35,40,42,44,61,62,74,76,82,85,88,89,93,95,102,104,106,111,114,120,123,141,143,146,149,158,170,171,178,186,190,198,201,207,209,210,221,223,227,245,249,250,259,260,265,272,276,283,284,294,296,301,305,306,311,312,317,318,321,322,325,331,333,337,339,345,347,348,350,365,375,377,379,382,391,394,401,407,411,413,415,424,428,445,453,467,469,471,474,487,489,490,492,497,498,515,519,520,524,528,529,530,531,554,557,567,568,575,576,597,603,615,616,631,637,640,641,643,650,654,656,657,662,668,676,678,688,694,695,698,700,701,702,703,716,725,727,729,730,732,733,738,747,750,771,774,777,778,780,785,796,798,799,805,808,819,821,822,827,831,833,835,838,841,844,847,848,858,859,860,863,864,872,875,889,906,912,913,914,917,942,943,945,948,950,952,954,955,959,967,971,980,981,983,993,997,1002,1003]