Skip to content

Commit 3fe37dd

Browse files
CmdvCmdv
committed
Merge branch 'master' into 1333-new-AddressDetail-table
2 parents 7fa6d96 + 161db86 commit 3fe37dd

32 files changed

+329
-1823
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Revision history for cardano-db-sync
22

3+
## 13.5.0.2
4+
- Fix an issue with restarts
5+
- Fix an issue with --disable-cache not working properly [#1838]
6+
37
## 13.5.0.0
48
- Fix a crtitical bug with committee foreign key, that could cause crashes
59

‎cabal.project

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repository cardano-haskell-packages
1010
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1111

1212
index-state:
13-
, hackage.haskell.org 2024-06-23T23:01:13Z
14-
, cardano-haskell-packages 2024-07-24T14:16:32Z
13+
, hackage.haskell.org 2024-09-10T19:44:01Z
14+
, cardano-haskell-packages 2024-09-06T13:43:41Z
1515

1616
packages:
1717
cardano-db
@@ -84,17 +84,11 @@ constraints:
8484
source-repository-package
8585
type: git
8686
location: https://github.com/IntersectMBO/cardano-node
87-
tag: 176f99e51155cb3eaa0711db1c3c969d67438958
88-
--sha256: sha256-F5wgRA820x16f+8c/LlEEBG0rMJIA1XWw6X0ZwX5UWs=
87+
tag: efd560070aaf042d1eb4680ae37fc607c7742319
88+
--sha256: sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=
8989
subdir:
9090
cardano-node
9191
cardano-submit-api
9292
trace-dispatcher
9393
trace-forward
9494
trace-resources
95-
96-
source-repository-package
97-
type: git
98-
location: https://github.com/input-output-hk/persistent-documentation
99-
tag: 0e95dbb144b02a2e6bf3a8a7531f4ad2f7d64ce5
100-
--sha256: 0jylzv9s5rv58m9ny1zna2imqhr4yjgxl3i9rp7rir6xr93c30js

‎cardano-chain-gen/cardano-chain-gen.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.6
22

33
name: cardano-chain-gen
4-
version: 13.5.0.0
4+
version: 13.5.0.2
55
synopsis: A fake chain generator for testing cardano DB sync.
66
description: A fake chain generator for testing cardano DB sync.
77
homepage: https://github.com/IntersectMBO/cardano-db-sync
@@ -72,7 +72,7 @@ library
7272
, cardano-ledger-conway
7373
, cardano-ledger-binary
7474
, cardano-ledger-core
75-
, cardano-ledger-shelley
75+
, cardano-ledger-shelley >= 1.12.3.0
7676
, cardano-ledger-mary
7777
, cardano-prelude
7878
, cardano-slotting
@@ -95,7 +95,7 @@ library
9595
, ouroboros-network-framework
9696
, ouroboros-network-protocols
9797
, plutus-core
98-
, plutus-ledger-api:{plutus-ledger-api-testlib}
98+
, plutus-ledger-api:{plutus-ledger-api-testlib} ==1.30.0.0
9999
, serialise
100100
, strict-sop-core
101101
, strict-stm
@@ -182,7 +182,7 @@ test-suite cardano-chain-gen
182182
, cardano-ledger-conway
183183
, cardano-ledger-core
184184
, cardano-ledger-mary
185-
, cardano-ledger-shelley
185+
, cardano-ledger-shelley >= 1.12.3.0
186186
, cardano-node
187187
, cardano-prelude
188188
, cardano-slotting

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

Lines changed: 80 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,24 @@ module Test.Cardano.Db.Mock.Config (
1717
fingerprintRoot,
1818
getDBSyncPGPass,
1919
getPoolLayer,
20+
21+
-- * Configs
2022
mkConfig,
2123
mkSyncNodeConfig,
2224
mkConfigDir,
25+
configPruneForceTxIn,
26+
configPrune,
27+
configConsume,
28+
configBootstrap,
29+
configPlutusDisable,
30+
configMultiAssetsDisable,
31+
configShelleyDisable,
32+
configRemoveJsonFromSchema,
33+
configRemoveJsonFromSchemaFalse,
34+
configLedgerIgnore,
35+
configMetadataEnable,
36+
configMetadataDisable,
37+
configMetadataKeys,
2338
mkFingerPrint,
2439
mkMutableDir,
2540
mkDBSyncEnv,
@@ -51,14 +66,14 @@ import qualified Cardano.Db as DB
5166
import Cardano.DbSync
5267
import Cardano.DbSync.Config
5368
import Cardano.DbSync.Config.Cardano
54-
import Cardano.DbSync.Config.Types (SyncInsertOptions (..), TxOutConfig (..), UseTxOutAddress (..))
69+
import Cardano.DbSync.Config.Types
5570
import Cardano.DbSync.Error (runOrThrowIO)
5671
import Cardano.DbSync.Types (CardanoBlock, MetricSetters (..))
5772
import Cardano.Mock.ChainSync.Server
5873
import Cardano.Mock.Forging.Interpreter
5974
import Cardano.Node.Protocol.Shelley (readLeaderCredentials)
6075
import Cardano.Node.Types (ProtocolFilepaths (..))
61-
import Cardano.Prelude (ReaderT, panic, stderr, textShow)
76+
import Cardano.Prelude (NonEmpty ((:|)), ReaderT, panic, stderr, textShow)
6277
import Cardano.SMASH.Server.PoolDataLayer
6378
import Control.Concurrent.Async (Async, async, cancel, poll)
6479
import Control.Concurrent.STM (atomically)
@@ -118,7 +133,6 @@ data CommandLineArgs = CommandLineArgs
118133
, claFullMode :: Bool
119134
, claMigrateConsumed :: Bool
120135
, claPruneTxOut :: Bool
121-
, claBootstrap :: Bool
122136
}
123137

124138
data WithConfigArgs = WithConfigArgs
@@ -281,10 +295,65 @@ mkSyncNodeParams staticDir mutableDir CommandLineArgs {..} = do
281295
, enpMaybeRollback = Nothing
282296
}
283297

298+
------------------------------------------------------------------------------
299+
-- Custom Configs
300+
------------------------------------------------------------------------------
284301
mkConfigFile :: FilePath -> FilePath -> ConfigFile
285302
mkConfigFile staticDir cliConfigFilename =
286303
ConfigFile $ staticDir </> cliConfigFilename
287304

305+
configPruneForceTxIn :: SyncNodeConfig -> SyncNodeConfig
306+
configPruneForceTxIn cfg = do
307+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioTxOut = TxOutPrune (ForceTxIn True)}}
308+
309+
configPrune :: SyncNodeConfig -> SyncNodeConfig
310+
configPrune cfg = do
311+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioTxOut = TxOutPrune (ForceTxIn False)}}
312+
313+
configConsume :: SyncNodeConfig -> SyncNodeConfig
314+
configConsume cfg = do
315+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioTxOut = TxOutConsumed (ForceTxIn False)}}
316+
317+
configBootstrap :: SyncNodeConfig -> SyncNodeConfig
318+
configBootstrap cfg = do
319+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioTxOut = TxOutBootstrap (ForceTxIn False)}}
320+
321+
configPlutusDisable :: SyncNodeConfig -> SyncNodeConfig
322+
configPlutusDisable cfg = do
323+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioPlutus = PlutusDisable}}
324+
325+
configMultiAssetsDisable :: SyncNodeConfig -> SyncNodeConfig
326+
configMultiAssetsDisable cfg = do
327+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioMultiAsset = MultiAssetDisable}}
328+
329+
configShelleyDisable :: SyncNodeConfig -> SyncNodeConfig
330+
configShelleyDisable cfg = do
331+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioShelley = ShelleyDisable}}
332+
333+
configRemoveJsonFromSchema :: SyncNodeConfig -> SyncNodeConfig
334+
configRemoveJsonFromSchema cfg = do
335+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig True}}
336+
337+
configRemoveJsonFromSchemaFalse :: SyncNodeConfig -> SyncNodeConfig
338+
configRemoveJsonFromSchemaFalse cfg = do
339+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False}}
340+
341+
configLedgerIgnore :: SyncNodeConfig -> SyncNodeConfig
342+
configLedgerIgnore cfg = do
343+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioLedger = LedgerIgnore}}
344+
345+
configMetadataEnable :: SyncNodeConfig -> SyncNodeConfig
346+
configMetadataEnable cfg = do
347+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioMetadata = MetadataEnable}}
348+
349+
configMetadataDisable :: SyncNodeConfig -> SyncNodeConfig
350+
configMetadataDisable cfg = do
351+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioMetadata = MetadataDisable}}
352+
353+
configMetadataKeys :: SyncNodeConfig -> SyncNodeConfig
354+
configMetadataKeys cfg = do
355+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioMetadata = MetadataKeys $ 1 :| []}}
356+
288357
initCommandLineArgs :: CommandLineArgs
289358
initCommandLineArgs =
290359
CommandLineArgs
@@ -303,7 +372,6 @@ initCommandLineArgs =
303372
, claFullMode = True
304373
, claMigrateConsumed = False
305374
, claPruneTxOut = False
306-
, claBootstrap = False
307375
}
308376

309377
emptyMetricsSetters :: MetricSetters
@@ -379,7 +447,7 @@ withFullConfigAndLogs =
379447
withCustomConfig ::
380448
CommandLineArgs ->
381449
-- | custom SyncNodeConfig
382-
Maybe SyncNodeConfig ->
450+
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
383451
-- | config filepath
384452
FilePath ->
385453
-- | test label
@@ -400,7 +468,7 @@ withCustomConfig =
400468
withCustomConfigAndDropDB ::
401469
CommandLineArgs ->
402470
-- | custom SyncNodeConfig
403-
Maybe SyncNodeConfig ->
471+
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
404472
-- | config filepath
405473
FilePath ->
406474
-- | test label
@@ -422,7 +490,7 @@ withCustomConfigAndDropDB =
422490
withCustomConfigAndLogs ::
423491
CommandLineArgs ->
424492
-- | custom SyncNodeConfig
425-
Maybe SyncNodeConfig ->
493+
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
426494
-- | config filepath
427495
FilePath ->
428496
-- | test label
@@ -443,7 +511,7 @@ withCustomConfigAndLogs =
443511
withCustomConfigAndLogsAndDropDB ::
444512
CommandLineArgs ->
445513
-- | custom SyncNodeConfig
446-
Maybe SyncNodeConfig ->
514+
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
447515
-- | config filepath
448516
FilePath ->
449517
-- | test label
@@ -465,7 +533,7 @@ withFullConfig' ::
465533
WithConfigArgs ->
466534
CommandLineArgs ->
467535
-- | custom SyncNodeConfig
468-
Maybe SyncNodeConfig ->
536+
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
469537
-- | config filepath
470538
FilePath ->
471539
-- | test label
@@ -479,7 +547,9 @@ withFullConfig' WithConfigArgs {..} cmdLineArgs mSyncNodeConfig configFilePath t
479547
-- check if custom syncNodeConfigs have been passed or not
480548
syncNodeConfig <-
481549
case mSyncNodeConfig of
482-
Just snc -> pure snc
550+
Just updateFn -> do
551+
initConfigFile <- mkSyncNodeConfig configFilePath cmdLineArgs
552+
pure $ updateFn initConfigFile
483553
Nothing -> mkSyncNodeConfig configFilePath cmdLineArgs
484554

485555
cfg <- mkConfig configFilePath mutableDir cmdLineArgs syncNodeConfig

0 commit comments

Comments
 (0)