Skip to content

Commit 0c6c779

Browse files
sgillespiesgillespie
authored
Merge branch 'master' into graceful-container-shutdown-stopsignal
2 parents 7c68622 + 785d55b commit 0c6c779

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+92
-5853
lines changed

‎CHANGELOG.md

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

3+
## 13.6.0.5
4+
- Fix offchain data so it supports files up to 3MB [#1928]
5+
- Upgrade to PostgreSQL 17
6+
- Stop creating views and deleting them on every restart [#1950]
7+
- Maintain less snapshots
8+
- No longer crash if stage 1 or 2 migration have been altered
9+
- Improvements for Address variant
310
- Fixes an issue where stopping the docker container results in non graceful shutdown
411

512
## 13.6.0.4

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

Lines changed: 4 additions & 17 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.6.0.4
4+
version: 13.6.0.5
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
@@ -19,7 +19,7 @@ extra-source-files: CHANGELOG.md
1919
custom-setup
2020
setup-depends:
2121
base
22-
, Cabal
22+
, Cabal >= 3.6 && <3.14
2323
, bytestring
2424
, cardano-crypto-class
2525
, directory
@@ -130,33 +130,21 @@ test-suite cardano-chain-gen
130130
other-modules: Test.Cardano.Db.Mock.Config
131131
Test.Cardano.Db.Mock.Examples
132132
Test.Cardano.Db.Mock.Property.Property
133+
Test.Cardano.Db.Mock.UnifiedApi
133134
Test.Cardano.Db.Mock.Unit.Alonzo
134135
Test.Cardano.Db.Mock.Unit.Alonzo.Config
135-
Test.Cardano.Db.Mock.Unit.Alonzo.Plutus
136-
Test.Cardano.Db.Mock.Unit.Alonzo.PoolAndSmash
137-
Test.Cardano.Db.Mock.Unit.Alonzo.Reward
138136
Test.Cardano.Db.Mock.Unit.Alonzo.Simple
139-
Test.Cardano.Db.Mock.Unit.Alonzo.Stake
140137
Test.Cardano.Db.Mock.Unit.Alonzo.Tx
141138
Test.Cardano.Db.Mock.Unit.Babbage
142-
Test.Cardano.Db.Mock.Unit.Babbage.CommandLineArg.ConfigFile
143-
Test.Cardano.Db.Mock.Unit.Babbage.CommandLineArg.EpochDisabled
144-
Test.Cardano.Db.Mock.Unit.Babbage.Config.MigrateConsumedPruneTxOut
145-
Test.Cardano.Db.Mock.Unit.Babbage.Config.Parse
146-
Test.Cardano.Db.Mock.Unit.Babbage.InlineAndReference
147-
Test.Cardano.Db.Mock.Unit.Babbage.Other
148-
Test.Cardano.Db.Mock.Unit.Babbage.Plutus
149139
Test.Cardano.Db.Mock.Unit.Babbage.Reward
150-
Test.Cardano.Db.Mock.Unit.Babbage.Rollback
151140
Test.Cardano.Db.Mock.Unit.Babbage.Simple
152-
Test.Cardano.Db.Mock.Unit.Babbage.Stake
153141
Test.Cardano.Db.Mock.Unit.Babbage.Tx
154142
Test.Cardano.Db.Mock.Unit.Conway
155143
Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.ConfigFile
156144
Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.EpochDisabled
157145
Test.Cardano.Db.Mock.Unit.Conway.Config.JsonbInSchema
158-
Test.Cardano.Db.Mock.Unit.Conway.Config.Parse
159146
Test.Cardano.Db.Mock.Unit.Conway.Config.MigrateConsumedPruneTxOut
147+
Test.Cardano.Db.Mock.Unit.Conway.Config.Parse
160148
Test.Cardano.Db.Mock.Unit.Conway.Governance
161149
Test.Cardano.Db.Mock.Unit.Conway.InlineAndReference
162150
Test.Cardano.Db.Mock.Unit.Conway.Other
@@ -166,7 +154,6 @@ test-suite cardano-chain-gen
166154
Test.Cardano.Db.Mock.Unit.Conway.Simple
167155
Test.Cardano.Db.Mock.Unit.Conway.Stake
168156
Test.Cardano.Db.Mock.Unit.Conway.Tx
169-
Test.Cardano.Db.Mock.UnifiedApi
170157
Test.Cardano.Db.Mock.Validate
171158

172159
build-depends: aeson

‎cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Babbage.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ mkUTxOBabbage :: AlonzoTx StandardBabbage -> [(TxIn StandardCrypto, BabbageTxOut
462462
mkUTxOBabbage = mkUTxOAlonzo
463463

464464
mkUTxOCollBabbage ::
465-
(BabbageEraTxBody era) =>
465+
BabbageEraTxBody era =>
466466
AlonzoTx era ->
467467
[(TxIn (EraCrypto era), TxOut era)]
468468
mkUTxOCollBabbage tx = Map.toList $ unUTxO $ collOuts $ getField @"body" tx

‎cardano-chain-gen/src/Cardano/Mock/Query.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,9 @@ queryVoteCounts txHash idx = do
199199
`innerJoin` table @Db.Tx
200200
`on` (\(vote :& tx) -> vote ^. Db.VotingProcedureTxId ==. tx ^. Db.TxId)
201201
where_ $
202-
vote ^. Db.VotingProcedureVote ==. val v
202+
vote
203+
^. Db.VotingProcedureVote
204+
==. val v
203205
&&. tx ^. Db.TxHash ==. val txHash
204206
&&. vote ^. Db.VotingProcedureIndex ==. val idx
205207
pure countRows

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ data CommandLineArgs = CommandLineArgs
122122
, claEpochDisabled :: Bool
123123
, claHasCache :: Bool
124124
, claHasLedger :: Bool
125-
, claSkipFix :: Bool
126-
, claOnlyFix :: Bool
127125
, claForceIndexes :: Bool
128126
, claHasMultiAssets :: Bool
129127
, claHasMetadata :: Bool
@@ -286,8 +284,6 @@ mkSyncNodeParams staticDir mutableDir CommandLineArgs {..} = do
286284
, enpPGPassSource = DB.PGPassCached pgconfig
287285
, enpEpochDisabled = claEpochDisabled
288286
, enpHasCache = claHasCache
289-
, enpSkipFix = claSkipFix
290-
, enpOnlyFix = claOnlyFix
291287
, enpForceIndexes = claForceIndexes
292288
, enpHasInOut = True
293289
, enpSnEveryFollowing = 35
@@ -361,8 +357,6 @@ initCommandLineArgs =
361357
, claEpochDisabled = True
362358
, claHasCache = True
363359
, claHasLedger = True
364-
, claSkipFix = True
365-
, claOnlyFix = False
366360
, claForceIndexes = False
367361
, claHasMultiAssets = True
368362
, claHasMetadata = True

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

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ import Test.Tasty (TestTree, testGroup)
1111
import Test.Tasty.HUnit (Assertion, testCase)
1212

1313
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Config as AlzConfig
14-
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Plutus as AlzPlutus
15-
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.PoolAndSmash as AlzPnS
16-
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Reward as AlzReward
1714
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Simple as AlzSimple
18-
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Stake as AlzStake
1915
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Tx as AlzTx
2016

2117
{- HLINT ignore "Reduce duplication" -}
@@ -41,71 +37,6 @@ unitTests iom knownMigrations =
4137
[ test "simple tx" AlzTx.addSimpleTx
4238
, test "consume utxo same block" AlzTx.consumeSameBlock
4339
]
44-
, testGroup
45-
"stake addresses"
46-
[ test "(de)registrations" AlzStake.registrationTx
47-
, test "(de)registrations in same block" AlzStake.registrationsSameBlock
48-
, test "(de)registrations in same tx" AlzStake.registrationsSameTx
49-
, test "stake address pointers" AlzStake.stakeAddressPtr
50-
, test "stake address pointers deregistration" AlzStake.stakeAddressPtrDereg
51-
, test "stake address pointers. Use before registering." AlzStake.stakeAddressPtrUseBefore
52-
]
53-
, testGroup
54-
"rewards"
55-
[ test "rewards simple" AlzReward.simpleRewards
56-
, test "rewards with deregistration" AlzReward.rewardsDeregistration
57-
, test "rewards with reregistration. Fixed in Babbage." AlzReward.rewardsReregistration
58-
, test "Mir Cert" AlzReward.mirReward
59-
, test "Mir rollback" AlzReward.mirRewardRollback
60-
, test "Mir Cert deregistration" AlzReward.mirRewardDereg
61-
, -- , test "test rewards empty last part of epoch" rewardsEmptyChainLast
62-
-- , test "test delta rewards" rewardsDelta -- See the same test on Babbage for the reason it was disabled.
63-
test "rollback on epoch boundary" AlzReward.rollbackBoundary
64-
, test "single MIR Cert multiple outputs" AlzReward.singleMIRCertMultiOut
65-
]
66-
, testGroup
67-
"stake distribution"
68-
[ test "stake distribution from genesis" AlzStake.stakeDistGenesis
69-
, test "2000 delegations" AlzStake.delegations2000
70-
, test "2001 delegations" AlzStake.delegations2001
71-
, test "8000 delegations" AlzStake.delegations8000
72-
, test "many delegations" AlzStake.delegationsMany
73-
, test "many delegations, sparse chain" AlzStake.delegationsManyNotDense
74-
]
75-
, testGroup
76-
"plutus spend scripts"
77-
[ test "simple script lock" AlzPlutus.simpleScript
78-
, test "unlock script in same block" AlzPlutus.unlockScriptSameBlock
79-
, test "failed script" AlzPlutus.failedScript
80-
, test "failed script in same block" AlzPlutus.failedScriptSameBlock
81-
, test "multiple scripts unlocked" AlzPlutus.multipleScripts
82-
, test "multiple scripts unlocked same block" AlzPlutus.multipleScriptsSameBlock
83-
, test "multiple scripts failed" AlzPlutus.multipleScriptsFailed
84-
, test "multiple scripts failed same block" AlzPlutus.multipleScriptsFailedSameBlock
85-
]
86-
, testGroup
87-
"plutus cert scripts"
88-
[ test "stake scripts" AlzPlutus.registrationScriptTx
89-
, test "stake scripts deregistration" AlzPlutus.deregistrationScriptTx
90-
, test "multiple stake scripts deregistration" AlzPlutus.deregistrationsScriptTxs
91-
, test "multiple stake scripts deregistration in same tx" AlzPlutus.deregistrationsScriptTx
92-
, test "multiple stake scripts deregistration in same tx missing redeemer 1" AlzPlutus.deregistrationsScriptTx'
93-
, test "multiple stake scripts deregistration in same tx missing redeemer 2" AlzPlutus.deregistrationsScriptTx''
94-
]
95-
, testGroup
96-
"MultiAssets plutus scripts"
97-
[ test "mint simple multi asset" AlzPlutus.mintMultiAsset
98-
, test "mint many multi assets" AlzPlutus.mintMultiAssets
99-
, test "swap many multi assets" AlzPlutus.swapMultiAssets
100-
]
101-
, testGroup
102-
"pools and smash"
103-
[ test "pool registration" AlzPnS.poolReg
104-
, test "query pool that's not registered" AlzPnS.nonexistantPoolQuery
105-
, test "pool deregistration" AlzPnS.poolDeReg
106-
, test "pool multiple deregistration" AlzPnS.poolDeRegMany
107-
, test "delist pool" AlzPnS.poolDelist
108-
]
10940
]
11041
where
11142
test :: String -> (IOManager -> [(Text, Text)] -> Assertion) -> TestTree

0 commit comments

Comments
 (0)