Skip to content

Commit f2cdb4d

Browse files
kdermekderme
committed
Integrate node-10
1 parent aa2e0c7 commit f2cdb4d

File tree

14 files changed

+54
-84
lines changed

14 files changed

+54
-84
lines changed

‎CHANGELOG.md

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

3+
## 13.6.0.0
4+
- A new config `use_address_table` addition makes it possible to use a separate table for addresses [#1697]
5+
- Support application/ld+json http mime type for vote metadata [#1842]
6+
- Support fetching from ipfs, using a new config `ipfs_gateway` [#1792]
7+
- Fix an issue with drep metadata images [#1857]
8+
- Fix an issue with pool_stat [#1833]
9+
10+
311
## 13.5.0.2
412
- Fix an issue with restarts
513
- Fix an issue with --disable-cache not working properly [#1838]

‎cabal.project

Lines changed: 4 additions & 4 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-09-10T19:44:01Z
14-
, cardano-haskell-packages 2024-09-06T13:43:41Z
13+
, hackage.haskell.org 2024-10-10T00:52:24Z
14+
, cardano-haskell-packages 2024-10-17T12:07:57Z
1515

1616
packages:
1717
cardano-db
@@ -84,8 +84,8 @@ constraints:
8484
source-repository-package
8585
type: git
8686
location: https://github.com/IntersectMBO/cardano-node
87-
tag: efd560070aaf042d1eb4680ae37fc607c7742319
88-
--sha256: sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=
87+
tag: cdb45dd5aa9b4cf43ef6a6c8ecd5b6afbef953e4
88+
--sha256: sha256-YFq/0HGlWqzij+9hOoXNhDHFH+5ltpMph8mmI4O8qeE=
8989
subdir:
9090
cardano-node
9191
cardano-submit-api

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

Lines changed: 2 additions & 2 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.2
4+
version: 13.6.0.0
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
@@ -95,7 +95,7 @@ library
9595
, ouroboros-network-framework
9696
, ouroboros-network-protocols
9797
, plutus-core
98-
, plutus-ledger-api:{plutus-ledger-api-testlib} ==1.30.0.0
98+
, plutus-ledger-api:{plutus-ledger-api-testlib}
9999
, serialise
100100
, strict-sop-core
101101
, strict-stm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ sm interpreter mockServer dbSync =
286286
prop_empty_blocks :: IOManager -> [(Text, Text)] -> Property
287287
prop_empty_blocks iom knownMigrations = withMaxSuccess 20 $ noShrinking $ forAllCommands smSymbolic (Just 20) $ \cmds -> monadicIO $ do
288288
(hist, res) <- run $ runAction $ \interpreter mockServer dbSync -> do
289-
(hist, _model, res) <- runCommands' (pure $ sm interpreter mockServer dbSync) cmds
289+
(hist, _model, res) <- runCommands' (sm interpreter mockServer dbSync) cmds
290290
pure (hist, res)
291291
prettyCommands smSymbolic hist (checkCommandNames cmds (res === Ok))
292292
where

‎cardano-db-sync/cardano-db-sync.cabal

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

33
name: cardano-db-sync
4-
version: 13.5.0.2
4+
version: 13.6.0.0
55
synopsis: The Cardano DB Sync node
66
description: A Cardano node that follows the Cardano chain and inserts data from the
77
chain into a PostgresQL database.
@@ -209,7 +209,7 @@ library
209209
, ouroboros-network-protocols
210210
, persistent
211211
, persistent-postgresql
212-
, plutus-ledger-api ==1.30.0.0
212+
, plutus-ledger-api
213213
, pretty-show
214214
, prometheus
215215
, psqueues

‎cardano-db-sync/src/Cardano/DbSync/Config/Cardano.hs

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{-# LANGUAGE MultiParamTypeClasses #-}
44
{-# LANGUAGE OverloadedStrings #-}
55
{-# LANGUAGE RankNTypes #-}
6+
{-# LANGUAGE TypeApplications #-}
67

78
module Cardano.DbSync.Config.Cardano (
89
GenesisConfig (..),
@@ -29,14 +30,12 @@ import qualified Cardano.Ledger.Api.Transition as Ledger
2930
import Cardano.Ledger.Binary.Version
3031
import Cardano.Ledger.Conway.Genesis
3132
import Control.Monad.Trans.Except (ExceptT)
32-
import Data.Word (Word64)
3333
import Ouroboros.Consensus.Block.Forging
3434
import Ouroboros.Consensus.Cardano (Nonce (..), ProtVer (ProtVer))
3535
import qualified Ouroboros.Consensus.Cardano as Consensus
3636
import Ouroboros.Consensus.Cardano.Node
3737
import Ouroboros.Consensus.Config (TopLevelConfig (..), emptyCheckpointsMap)
3838
import Ouroboros.Consensus.Ledger.Basics (LedgerConfig)
39-
import qualified Ouroboros.Consensus.Mempool.Capacity as TxLimits
4039
import Ouroboros.Consensus.Node.ProtocolInfo (ProtocolInfo)
4140
import qualified Ouroboros.Consensus.Node.ProtocolInfo as Consensus
4241
import Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
@@ -92,56 +91,26 @@ mkProtocolInfoCardano ::
9291
mkProtocolInfoCardano genesisConfig shelleyCred =
9392
protocolInfoCardano $
9493
CardanoProtocolParams
95-
{ paramsByron =
94+
{ byronProtocolParams =
9695
Consensus.ProtocolParamsByron
9796
{ Consensus.byronGenesis = bGenesis
9897
, Consensus.byronPbftSignatureThreshold = Consensus.PBftSignatureThreshold <$> dncPBftSignatureThreshold dnc
9998
, Consensus.byronProtocolVersion = dncByronProtocolVersion dnc
10099
, Consensus.byronSoftwareVersion = mkByronSoftwareVersion
101100
, Consensus.byronLeaderCredentials = Nothing
102-
, Consensus.byronMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
103101
}
104-
, paramsShelleyBased =
102+
, shelleyBasedProtocolParams =
105103
Consensus.ProtocolParamsShelleyBased
106104
{ Consensus.shelleyBasedInitialNonce = shelleyPraosNonce genesisHash
107105
, Consensus.shelleyBasedLeaderCredentials = shelleyCred
108106
}
109-
, paramsShelley =
110-
Consensus.ProtocolParamsShelley
111-
{ Consensus.shelleyProtVer = mkProtVer 3 0
112-
, Consensus.shelleyMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
113-
}
114-
, paramsAllegra =
115-
Consensus.ProtocolParamsAllegra
116-
{ Consensus.allegraProtVer = mkProtVer 4 0
117-
, Consensus.allegraMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
118-
}
119-
, paramsMary =
120-
Consensus.ProtocolParamsMary
121-
{ Consensus.maryProtVer = mkProtVer 5 0
122-
, Consensus.maryMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
123-
}
124-
, paramsAlonzo =
125-
Consensus.ProtocolParamsAlonzo
126-
{ Consensus.alonzoProtVer = mkProtVer 7 0
127-
, Consensus.alonzoMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
128-
}
129-
, paramsBabbage =
130-
Consensus.ProtocolParamsBabbage
131-
{ Consensus.babbageProtVer = mkProtVer 9 0
132-
, Consensus.babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
133-
}
134-
, paramsConway =
135-
Consensus.ProtocolParamsConway
136-
{ Consensus.conwayProtVer = mkProtVer 10 0
137-
, Consensus.conwayMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure -- TODO: Conway
138-
}
139-
, ledgerTransitionConfig =
107+
, cardanoProtocolVersion = ProtVer (natVersion @10) 0
108+
, cardanoLedgerTransitionConfig =
140109
Ledger.mkLatestTransitionConfig
141110
shelleyGenesis
142111
alonzoGenesis
143112
conwayGenesis
144-
, hardForkTriggers =
113+
, cardanoHardForkTriggers =
145114
Consensus.CardanoHardForkTriggers'
146115
{ triggerHardForkShelley = dncShelleyHardFork dnc
147116
, triggerHardForkAllegra = dncAllegraHardFork dnc
@@ -150,7 +119,7 @@ mkProtocolInfoCardano genesisConfig shelleyCred =
150119
, triggerHardForkBabbage = dncBabbageHardFork dnc
151120
, triggerHardForkConway = dncConwayHardFork dnc
152121
}
153-
, checkpoints = emptyCheckpointsMap
122+
, cardanoCheckpoints = emptyCheckpointsMap
154123
}
155124
where
156125
GenesisCardano
@@ -163,12 +132,6 @@ mkProtocolInfoCardano genesisConfig shelleyCred =
163132
shelleyPraosNonce :: GenesisHashShelley -> Nonce
164133
shelleyPraosNonce hsh = Nonce (Crypto.castHash . unGenesisHashShelley $ hsh)
165134

166-
mkProtVer :: Word64 -> Word64 -> ProtVer
167-
mkProtVer a b =
168-
case mkVersion64 a of
169-
Nothing -> error $ "Impossible: Invalid version generated: " <> show a
170-
Just v -> ProtVer v (fromIntegral b)
171-
172135
mkByronSoftwareVersion :: SoftwareVersion
173136
mkByronSoftwareVersion =
174137
SoftwareVersion name ver

‎cardano-db-sync/src/Cardano/DbSync/Ledger/Event.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,14 @@ toLedgerEventConway evt hasRewards =
253253
ShelleyLedgerEventTICK
254254
( TickNewEpochEvent
255255
( Conway.EpochEvent
256-
(Conway.GovInfoEvent en ex uncl)
256+
(Conway.GovInfoEvent _ en ex uncl)
257257
)
258258
) ->
259259
Just $
260260
LedgerGovInfo
261261
(toGovActionRefunded True <$> toList en)
262262
(toGovActionRefunded False <$> toList ex)
263-
uncl
263+
(Map.keysSet uncl)
264264
_ -> Nothing
265265
where
266266
toGovActionRefunded :: EraCrypto era ~ StandardCrypto => Bool -> GovActionState era -> GovActionRefunded

‎cardano-db-tool/cardano-db-tool.cabal

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

33
name: cardano-db-tool
4-
version: 13.5.0.2
4+
version: 13.6.0.0
55
synopsis: Utilities to manage the cardano-db-sync databases.
66
description: Utilities and executable, used to manage and validate the
77
PostgreSQL db and the ledger database of the cardano-db-sync node

‎cardano-db/cardano-db.cabal

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

33
name: cardano-db
4-
version: 13.5.0.2
4+
version: 13.6.0.0
55
synopsis: A base PostgreSQL component for the cardano-db-sync node.
66
description: Code for the Cardano DB Sync node that is shared between the
77
cardano-db-node and other components.

‎cardano-db/test/cardano-db-test.cabal

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

33
name: cardano-db-test
4-
version: 13.5.0.2
4+
version: 13.6.0.0
55
synopsis: Tests for the base functionality of the cardano-db library
66
description: Code for the Cardano DB Sync node that is shared between the
77
cardano-db-node and other components.

0 commit comments

Comments
 (0)