Skip to content

Commit fe74a8f

Browse files
committed
Update to node-8.11
1 parent bec5dad commit fe74a8f

File tree

7 files changed

+31
-10
lines changed

7 files changed

+31
-10
lines changed

cabal.project

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repository cardano-haskell-packages
1111

1212
index-state:
1313
, hackage.haskell.org 2024-03-26T06:28:59Z
14-
, cardano-haskell-packages 2024-04-05T07:51:28Z
14+
, cardano-haskell-packages 2024-05-14T16:00:00Z
1515

1616
packages:
1717
cardano-db
@@ -79,8 +79,8 @@ allow-newer:
7979
source-repository-package
8080
type: git
8181
location: https://github.com/IntersectMBO/cardano-node
82-
tag: 04e060e6d86a5791c00aa518b2cee025384be28b
83-
--sha256: sha256-3cG3QV2DbDKxZTnSXMB+hU8Ijxb4oHWNjVs4mOPft7I=
82+
tag: 4a18841e7df0d10edab98a612c80217ea49a5c11
83+
--sha256: sha256-T5kZqlzTnaain3rypUwhpmY3YcZoDtbSqEQADeucJH4=
8484
subdir:
8585
cardano-node
8686
cardano-submit-api

cardano-chain-gen/src/Cardano/Mock/Forging/Interpreter.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ import Ouroboros.Consensus.Protocol.Abstract (
115115
LedgerView,
116116
tickChainDepState,
117117
)
118-
import Ouroboros.Consensus.Protocol.Praos.Translate ()
118+
import Ouroboros.Consensus.Protocol.Praos ()
119119
import Ouroboros.Consensus.Protocol.TPraos ()
120120
import Ouroboros.Consensus.Shelley.HFEras ()
121121
import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock, Ticked, shelleyLedgerState)

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

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,21 @@ module Cardano.DbSync.Config.Conway (
1111
import Cardano.Crypto.Hash (hashToBytes, hashWith)
1212
import Cardano.DbSync.Config.Types
1313
import Cardano.DbSync.Error (SyncNodeError (..))
14+
import Cardano.Ledger.BaseTypes (EpochInterval (..))
15+
import Cardano.Ledger.Coin (Coin (..))
1416
import Cardano.Ledger.Conway.Genesis (ConwayGenesis (..))
17+
import Cardano.Ledger.Conway.PParams (UpgradeConwayPParams (..))
1518
import Cardano.Ledger.Crypto (StandardCrypto ())
19+
import Cardano.Ledger.Plutus.CostModels (mkCostModel)
20+
import Cardano.Ledger.Plutus.Language (Language (..))
1621
import Cardano.Prelude
1722
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left)
1823
import qualified Data.Aeson as Aeson
1924
import qualified Data.ByteString as ByteString
2025
import Data.ByteString.Base16 as Base16
2126
import Data.Default.Class (def)
2227
import qualified Data.Text as Text
23-
import Prelude ()
28+
import Prelude (error)
2429

2530
type ExceptIO e = ExceptT e IO
2631

@@ -36,11 +41,27 @@ readConwayGenesisConfig ::
3641
readConwayGenesisConfig SyncNodeConfig {..} =
3742
case dncConwayGenesisFile of
3843
Just file -> readConwayGenesisConfig' file dncConwayGenesisHash
39-
Nothing -> pure (ConwayGenesis def def def mempty mempty)
44+
Nothing -> pure (ConwayGenesis defaultUpgradeConwayPParams def def mempty mempty)
4045
where
4146
readConwayGenesisConfig' file hash =
4247
firstExceptT (SNErrConwayConfig (unGenesisFile file) . renderConwayGenesisError) $
4348
readGenesis file hash
49+
defaultUpgradeConwayPParams :: UpgradeConwayPParams Identity
50+
defaultUpgradeConwayPParams =
51+
UpgradeConwayPParams
52+
{ ucppPoolVotingThresholds = def
53+
, ucppDRepVotingThresholds = def
54+
, ucppCommitteeMinSize = 0
55+
, ucppCommitteeMaxTermLength = EpochInterval 0
56+
, ucppGovActionLifetime = EpochInterval 0
57+
, ucppGovActionDeposit = Coin 0
58+
, ucppDRepDeposit = Coin 0
59+
, ucppDRepActivity = EpochInterval 0
60+
, ucppMinFeeRefScriptCostPerByte = minBound
61+
, ucppPlutusV3CostModel = case mkCostModel PlutusV3 (replicate 233 0) of
62+
Left err -> error $ "Failed to create default Plutus V3 CostModel " <> show err
63+
Right cm -> cm
64+
}
4465

4566
readGenesis ::
4667
GenesisFile ->

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Util.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ unTxHash :: TxId era -> ByteString
153153
unTxHash (TxId txid) = Crypto.hashToBytes $ Ledger.extractHash txid
154154

155155
unAssetName :: AssetName -> ByteString
156-
unAssetName = SBS.fromShort . assetName
156+
unAssetName = SBS.fromShort . assetNameBytes
157157

158158
dataHashToBytes :: DataHash -> ByteString
159159
dataHashToBytes = Crypto.hashToBytes . Ledger.extractHash

cardano-db-sync/src/Cardano/DbSync/Util.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import qualified Data.Text as Text
5555
import qualified Data.Text.Encoding as Text
5656
import qualified Data.Time.Clock as Time
5757
import Ouroboros.Consensus.Block.Abstract (ConvertRawHash (..))
58-
import Ouroboros.Consensus.Protocol.Praos.Translate ()
58+
import Ouroboros.Consensus.Protocol.Praos ()
5959
import Ouroboros.Consensus.Shelley.HFEras ()
6060
import Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
6161
import Ouroboros.Network.Block (blockSlot, getPoint)

cardano-db/src/Cardano/Db/Delete.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import Database.Persist.Sql (
4545
deleteWhereCount,
4646
selectKeysList,
4747
(==.),
48-
(>=.),
4948
(>.),
49+
(>=.),
5050
)
5151

5252
deleteBlocksSlotNoNoTrace :: MonadIO m => SlotNo -> ReaderT SqlBackend m Bool

cardano-db/test/Test/Property/Cardano/Db/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ prop_AssetFingerprint =
4848
unScriptHash (Ledger.ScriptHash h) = Crypto.hashToBytes h
4949

5050
unAssetName :: AssetName -> ByteString
51-
unAssetName = SBS.fromShort . assetName
51+
unAssetName = SBS.fromShort . assetNameBytes
5252

5353
testVectors :: [(PolicyID StandardCrypto, AssetName, AssetFingerprint)]
5454
testVectors =

0 commit comments

Comments
 (0)