Skip to content

Commit 9e44634

Browse files
kdermekderme
committed
Update to Node 8.8
1 parent 35879f7 commit 9e44634

File tree

27 files changed

+293
-170
lines changed

27 files changed

+293
-170
lines changed

‎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 2023-11-20T23:52:53Z
14-
, cardano-haskell-packages 2023-12-06T19:40:56Z
13+
, hackage.haskell.org 2024-02-06T15:14:59Z
14+
, cardano-haskell-packages 2024-02-07T07:51:35Z
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: 34d89af65439db92293b88967c299c20692abc1c
83-
--sha256: sha256-pVUWfzVnM4RvpFlJNH2ZmWPZzmkGT1Ty8B1p7NFh69M=
82+
tag: 4bb2048db77d623ee6e3678618c2d8b6c4676333
83+
--sha256: sha256-pWXI8dyqKQ3HncbBtd54wdHi3Pj7J5y+nybqpzMXOj4=
8484
subdir:
8585
cardano-git-rev
8686
cardano-node

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,4 @@ test-suite cardano-chain-gen
212212
, persistent-postgresql
213213
, postgresql-simple
214214
, QuickCheck
215-
, quickcheck-state-machine
215+
, quickcheck-state-machine:no-vendored-treediff

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import qualified Cardano.Db as DB
1111
import Cardano.DbSync.Api
1212
import Cardano.DbSync.Api.Types
1313
import Cardano.DbSync.Era.Shelley.Generic.Tx.Babbage (fromTxOut)
14+
import Cardano.DbSync.Era.Shelley.Generic.Tx.Types (DBPlutusScript)
1415
import qualified Cardano.DbSync.Era.Shelley.Generic.Util as Generic
1516
import qualified Cardano.DbSync.Era.Shelley.Insert as Insert
1617
import Cardano.DbSync.Era.Shelley.Insert.Grouped
@@ -105,6 +106,7 @@ storeUTxO ::
105106
, BabbageEraTxOut era
106107
, MonadIO m
107108
, MonadBaseControl IO m
109+
, DBPlutusScript era
108110
) =>
109111
SyncEnv ->
110112
TxCache ->
@@ -131,6 +133,7 @@ storePage ::
131133
, Cardano.Ledger.Core.Value era ~ MaryValue StandardCrypto
132134
, Script era ~ AlonzoScript era
133135
, TxOut era ~ BabbageTxOut era
136+
, DBPlutusScript era
134137
, BabbageEraTxOut era
135138
, MonadIO m
136139
, MonadBaseControl IO m
@@ -158,6 +161,7 @@ prepareTxOut ::
158161
, BabbageEraTxOut era
159162
, MonadIO m
160163
, MonadBaseControl IO m
164+
, DBPlutusScript era
161165
) =>
162166
SyncEnv ->
163167
TxCache ->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ readConwayGenesisConfig ::
3636
readConwayGenesisConfig SyncNodeConfig {..} =
3737
case dncConwayGenesisFile of
3838
Just file -> readConwayGenesisConfig' file dncConwayGenesisHash
39-
Nothing -> pure (ConwayGenesis def def def)
39+
Nothing -> pure (ConwayGenesis def def def mempty mempty)
4040
where
4141
readConwayGenesisConfig' file hash =
4242
firstExceptT (SNErrConwayConfig (unGenesisFile file) . renderConwayGenesisError) $

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ module Cardano.DbSync.Era.Shelley.Generic.Metadata (
2020
) where
2121

2222
import qualified Cardano.Ledger.Allegra.TxAuxData as Allegra
23+
import Cardano.Ledger.Alonzo.Scripts (AlonzoEraScript)
2324
import qualified Cardano.Ledger.Alonzo.TxAuxData as Alonzo
24-
import Cardano.Ledger.Era (Era)
2525
import qualified Cardano.Ledger.Shelley.TxAuxData as Shelley
2626
import Cardano.Prelude
2727
import qualified Data.Aeson as Aeson
@@ -48,7 +48,7 @@ fromAllegraMetadata :: Allegra.AllegraTxAuxData StandardAllegra -> Map Word64 Tx
4848
fromAllegraMetadata (Allegra.AllegraTxAuxData mdMap _scripts) =
4949
Map.map fromMetadatum mdMap
5050

51-
fromAlonzoMetadata :: Era era => Alonzo.AlonzoTxAuxData era -> Map Word64 TxMetadataValue
51+
fromAlonzoMetadata :: AlonzoEraScript era => Alonzo.AlonzoTxAuxData era -> Map Word64 TxMetadataValue
5252
fromAlonzoMetadata aux =
5353
Map.map fromMetadatum $ Alonzo.atadMetadata aux
5454

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ import Cardano.DbSync.Era.Shelley.Generic.Util (unKeyHashRaw)
1515
import Cardano.DbSync.Era.Shelley.Generic.Witness (Witness (..))
1616
import Cardano.Ledger.Alonzo.Core
1717
import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
18-
import Cardano.Ledger.BaseTypes (UnitInterval, strictMaybeToMaybe)
18+
import Cardano.Ledger.BaseTypes (EpochInterval, UnitInterval, strictMaybeToMaybe)
1919
import qualified Cardano.Ledger.BaseTypes as Ledger
2020
import Cardano.Ledger.Coin (Coin, unCoin)
2121
import Cardano.Ledger.Conway.Core
22-
import Cardano.Ledger.Conway.PParams
2322
import Cardano.Ledger.Crypto
2423
import qualified Cardano.Ledger.Keys as Ledger
2524
import Cardano.Ledger.Plutus.Language (Language)
@@ -35,12 +34,12 @@ data ParamProposal = ParamProposal
3534
, pppKey :: !(Maybe ByteString)
3635
, pppMinFeeA :: !(Maybe Natural)
3736
, pppMinFeeB :: !(Maybe Natural)
38-
, pppMaxBlockSize :: !(Maybe Natural)
39-
, pppMaxTxSize :: !(Maybe Natural)
40-
, pppMaxBhSize :: !(Maybe Natural)
37+
, pppMaxBlockSize :: !(Maybe Word32)
38+
, pppMaxTxSize :: !(Maybe Word32)
39+
, pppMaxBhSize :: !(Maybe Word16)
4140
, pppKeyDeposit :: !(Maybe Coin)
4241
, pppPoolDeposit :: !(Maybe Coin)
43-
, pppMaxEpoch :: !(Maybe EpochNo)
42+
, pppMaxEpoch :: !(Maybe EpochInterval)
4443
, pppOptimalPoolCount :: !(Maybe Natural)
4544
, pppInfluence :: !(Maybe Rational)
4645
, pppMonetaryExpandRate :: !(Maybe UnitInterval)
@@ -66,11 +65,11 @@ data ParamProposal = ParamProposal
6665
pppPoolVotingThresholds :: !(Maybe PoolVotingThresholds)
6766
, pppDRepVotingThresholds :: !(Maybe DRepVotingThresholds)
6867
, pppCommitteeMinSize :: !(Maybe Natural)
69-
, pppCommitteeMaxTermLength :: !(Maybe Word64)
70-
, pppGovActionLifetime :: !(Maybe EpochNo)
68+
, pppCommitteeMaxTermLength :: !(Maybe EpochInterval)
69+
, pppGovActionLifetime :: !(Maybe EpochInterval)
7170
, pppGovActionDeposit :: !(Maybe Natural)
7271
, pppDRepDeposit :: !(Maybe Natural)
73-
, pppDRepActivity :: !(Maybe EpochNo)
72+
, pppDRepActivity :: !(Maybe EpochInterval)
7473
}
7574

7675
convertParamProposal :: EraCrypto era ~ StandardCrypto => Witness era -> Shelley.Update era -> [ParamProposal]
@@ -135,7 +134,7 @@ convertConwayParamProposal pmap =
135134
pppPoolVotingThresholds = strictMaybeToMaybe (pmap ^. ppuPoolVotingThresholdsL)
136135
, pppDRepVotingThresholds = strictMaybeToMaybe (pmap ^. ppuDRepVotingThresholdsL)
137136
, pppCommitteeMinSize = strictMaybeToMaybe (pmap ^. ppuCommitteeMinSizeL)
138-
, pppCommitteeMaxTermLength = unEpochNo <$> strictMaybeToMaybe (pmap ^. ppuCommitteeMaxTermLengthL)
137+
, pppCommitteeMaxTermLength = strictMaybeToMaybe (pmap ^. ppuCommitteeMaxTermLengthL)
139138
, pppGovActionLifetime = strictMaybeToMaybe (pmap ^. ppuGovActionLifetimeL)
140139
, pppGovActionDeposit = fromIntegral . unCoin <$> strictMaybeToMaybe (pmap ^. ppuGovActionDepositL)
141140
, pppDRepDeposit = fromIntegral . unCoin <$> strictMaybeToMaybe (pmap ^. ppuDRepDepositL)

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ module Cardano.DbSync.Era.Shelley.Generic.ProtoParams (
1111
import Cardano.DbSync.Types
1212
import Cardano.Ledger.Alonzo.Core
1313
import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
14-
import Cardano.Ledger.BaseTypes (UnitInterval)
14+
import Cardano.Ledger.BaseTypes (EpochInterval, UnitInterval)
1515
import qualified Cardano.Ledger.BaseTypes as Ledger
1616
import Cardano.Ledger.Coin (Coin (..))
1717
import Cardano.Ledger.Conway.Core
18-
import Cardano.Ledger.Conway.PParams hiding (params)
1918
import Cardano.Ledger.Plutus.Language (Language)
2019
import qualified Cardano.Ledger.Shelley.LedgerState as Shelley
2120
import Cardano.Prelude
22-
import Cardano.Slotting.Slot (EpochNo (..))
2321
import Lens.Micro ((^.))
2422
import Ouroboros.Consensus.Cardano (Nonce (..))
2523
import Ouroboros.Consensus.Cardano.Block hiding (CardanoBlock)
@@ -30,12 +28,12 @@ import qualified Ouroboros.Consensus.Shelley.Ledger.Ledger as Consensus
3028
data ProtoParams = ProtoParams
3129
{ ppMinfeeA :: !Natural
3230
, ppMinfeeB :: !Natural
33-
, ppMaxBBSize :: !Natural
34-
, ppMaxTxSize :: !Natural
35-
, ppMaxBHSize :: !Natural
31+
, ppMaxBBSize :: !Word32
32+
, ppMaxTxSize :: !Word32
33+
, ppMaxBHSize :: !Word16
3634
, ppKeyDeposit :: !Coin
3735
, ppPoolDeposit :: !Coin
38-
, ppMaxEpoch :: !EpochNo
36+
, ppMaxEpoch :: !EpochInterval
3937
, ppOptialPoolCount :: !Natural
4038
, ppInfluence :: !Rational
4139
, ppMonetaryExpandRate :: !UnitInterval
@@ -61,11 +59,11 @@ data ProtoParams = ProtoParams
6159
ppPoolVotingThresholds :: !(Maybe PoolVotingThresholds)
6260
, ppDRepVotingThresholds :: !(Maybe DRepVotingThresholds)
6361
, ppCommitteeMinSize :: !(Maybe Natural)
64-
, ppCommitteeMaxTermLength :: !(Maybe Word64)
65-
, ppGovActionLifetime :: !(Maybe EpochNo)
62+
, ppCommitteeMaxTermLength :: !(Maybe EpochInterval)
63+
, ppGovActionLifetime :: !(Maybe EpochInterval)
6664
, ppGovActionDeposit :: !(Maybe Natural)
6765
, ppDRepDeposit :: !(Maybe Natural)
68-
, ppDRepActivity :: !(Maybe EpochNo)
66+
, ppDRepActivity :: !(Maybe EpochInterval)
6967
}
7068

7169
epochProtoParams :: ExtLedgerState CardanoBlock -> Maybe ProtoParams
@@ -121,7 +119,7 @@ fromConwayParams params =
121119
, ppPoolVotingThresholds = Just $ params ^. ppPoolVotingThresholdsL
122120
, ppDRepVotingThresholds = Just $ params ^. ppDRepVotingThresholdsL
123121
, ppCommitteeMinSize = Just $ params ^. ppCommitteeMinSizeL
124-
, ppCommitteeMaxTermLength = Just . unEpochNo $ params ^. ppCommitteeMaxTermLengthL
122+
, ppCommitteeMaxTermLength = Just $ params ^. ppCommitteeMaxTermLengthL
125123
, ppGovActionLifetime = Just $ params ^. ppGovActionLifetimeL
126124
, ppGovActionDeposit = Just . fromIntegral . unCoin $ params ^. ppGovActionDepositL
127125
, ppDRepDeposit = Just . fromIntegral . unCoin $ params ^. ppDRepDepositL

‎cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx/Alonzo.hs

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{-# LANGUAGE DataKinds #-}
33
{-# LANGUAGE FlexibleContexts #-}
44
{-# LANGUAGE GADTs #-}
5+
{-# LANGUAGE LambdaCase #-}
56
{-# LANGUAGE RankNTypes #-}
67
{-# LANGUAGE ScopedTypeVariables #-}
78
{-# LANGUAGE TypeApplications #-}
@@ -36,7 +37,7 @@ import Cardano.DbSync.Era.Shelley.Generic.Util
3637
import Cardano.DbSync.Era.Shelley.Generic.Witness
3738
import Cardano.DbSync.Types (DataHash)
3839
import qualified Cardano.Ledger.Address as Ledger
39-
import Cardano.Ledger.Alonzo.Scripts (ExUnits (..), txscriptfee, unBinaryPlutus)
40+
import Cardano.Ledger.Alonzo.Scripts (AsIndex (..), ExUnits (..), PlutusPurpose (..), txscriptfee, unPlutusBinary)
4041
import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
4142
import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
4243
import Cardano.Ledger.Alonzo.TxAuxData (AlonzoTxAuxData (..), getAlonzoTxAuxDataScripts)
@@ -46,21 +47,29 @@ import qualified Cardano.Ledger.Alonzo.TxWits as Alonzo
4647
import Cardano.Ledger.BaseTypes
4748
import Cardano.Ledger.Coin (Coin (..))
4849
import qualified Cardano.Ledger.Core as Core
49-
import qualified Cardano.Ledger.Era as Ledger
50+
51+
-- import qualified Cardano.Ledger.Era as Ledger
5052
import qualified Cardano.Ledger.Keys as Ledger
5153
import Cardano.Ledger.Mary.Value (MaryValue (..), MultiAsset (..), policyID)
52-
import Cardano.Ledger.Plutus.Language (Plutus (..))
53-
import qualified Cardano.Ledger.Plutus.Language as Alonzo
54+
55+
-- import Cardano.Ledger.Plutus.Language (Plutus (..))
56+
-- import qualified Cardano.Ledger.Plutus.Language as Alonzo
5457
import qualified Cardano.Ledger.SafeHash as Ledger
5558
import Cardano.Ledger.Shelley.Scripts (ScriptHash)
56-
import qualified Cardano.Ledger.Shelley.Tx as ShelleyTx
59+
60+
-- import qualified Cardano.Ledger.Shelley.Tx as ShelleyTx
5761
import qualified Cardano.Ledger.Shelley.TxBody as Shelley
5862
import Cardano.Ledger.Shelley.TxCert as Shelley
5963
import Cardano.Prelude
6064
import qualified Data.Aeson as Aeson
6165
import qualified Data.ByteString.Lazy.Char8 as LBS
66+
6267
import qualified Data.ByteString.Short as SBS
68+
69+
import Cardano.Ledger.Conway.Scripts (ConwayPlutusPurpose (..))
70+
import qualified Cardano.Ledger.TxIn as Ledger
6371
import qualified Data.Map.Strict as Map
72+
import qualified Data.Maybe.Strict as Strict
6473
import qualified Data.Set as Set
6574
import Lens.Micro
6675
import Ouroboros.Consensus.Cardano.Block (EraCrypto, StandardAlonzo, StandardCrypto)
@@ -149,6 +158,7 @@ getScripts ::
149158
, Core.Script era ~ Alonzo.AlonzoScript era
150159
, Core.TxAuxData era ~ AlonzoTxAuxData era
151160
, Core.EraTx era
161+
, DBPlutusScript era
152162
) =>
153163
Core.Tx era ->
154164
[TxScript]
@@ -174,7 +184,7 @@ resolveRedeemers ::
174184
( EraCrypto era ~ StandardCrypto
175185
, Alonzo.AlonzoEraTxWits era
176186
, Core.EraTx era
177-
, Alonzo.MaryEraTxBody era
187+
, DBScriptPurpose era
178188
) =>
179189
Bool ->
180190
Maybe Alonzo.Prices ->
@@ -204,15 +214,15 @@ resolveRedeemers ioExtraPlutus mprices tx toCert =
204214
toList $
205215
toCert <$> (txBody ^. Core.certsTxBodyL)
206216

207-
txInsMissingRedeemer :: Map (ShelleyTx.TxIn StandardCrypto) TxIn
217+
txInsMissingRedeemer :: Map (Ledger.TxIn StandardCrypto) TxIn
208218
txInsMissingRedeemer = Map.fromList $ fmap (\inp -> (inp, fromTxIn inp)) $ toList $ txBody ^. Core.inputsTxBodyL
209219

210220
initRedeemersMaps :: RedeemerMaps
211221
initRedeemersMaps = RedeemerMaps withdrawalsNoRedeemers txCertsNoRedeemers txInsMissingRedeemer
212222

213223
mkRdmrAndUpdateRec ::
214224
(RedeemerMaps, [(Word64, TxRedeemer)]) ->
215-
[(Word64, (Alonzo.RdmrPtr, (Alonzo.Data era, ExUnits)))] ->
225+
[(Word64, (Alonzo.PlutusPurpose AsIndex era, (Alonzo.Data era, ExUnits)))] ->
216226
(RedeemerMaps, [(Word64, TxRedeemer)])
217227
mkRdmrAndUpdateRec (rdmrMaps, rdmrsAcc) [] = (rdmrMaps, reverse rdmrsAcc)
218228
mkRdmrAndUpdateRec (rdmrMaps, rdmrsAcc) ((rdmrIx, rdmr) : rest) =
@@ -221,33 +231,46 @@ resolveRedeemers ioExtraPlutus mprices tx toCert =
221231

222232
handleRedeemer ::
223233
Word64 ->
224-
(Alonzo.RdmrPtr, (Alonzo.Data era, ExUnits)) ->
234+
(PlutusPurpose AsIndex era, (Alonzo.Data era, ExUnits)) ->
225235
RedeemerMaps ->
226236
(TxRedeemer, RedeemerMaps)
227-
handleRedeemer rdmrIx (ptr@(Alonzo.RdmrPtr tag index), (dt, exUnits)) rdmrMps =
237+
handleRedeemer rdmrIx (ptr, (dt, exUnits)) rdmrMps =
228238
(txRdmr, rdmrMps')
229239
where
230-
(rdmrMps', mScript) = case strictMaybeToMaybe (Alonzo.rdptrInv txBody ptr) of
231-
Just (Alonzo.Minting policyId) -> (rdmrMps, Just $ Right $ unScriptHash $ policyID policyId)
232-
Just (Alonzo.Spending txIn) -> handleTxInPtr rdmrIx txIn rdmrMps
233-
Just (Alonzo.Rewarding rwdAcnt) -> handleRewardPtr rdmrIx rwdAcnt rdmrMps
234-
Just prp@(Alonzo.Certifying dcert) -> case strictMaybeToMaybe (Alonzo.rdptr txBody prp) of
235-
Just ptr' | ptr == ptr' -> handleCertPtr rdmrIx (toCert dcert) rdmrMps
236-
_ -> (rdmrMps, Nothing)
240+
(rdmrMps', mScript) = case mkPurpose $ Alonzo.redeemerPointerInverse txBody ptr of
241+
Just (Left (Alonzo.AlonzoMinting policyId, _)) -> (rdmrMps, Just $ Right $ unScriptHash $ policyID (Alonzo.unAsItem policyId))
242+
Just (Left (Alonzo.AlonzoSpending txIn, _)) -> handleTxInPtr rdmrIx (Alonzo.unAsItem txIn) rdmrMps
243+
Just (Left (Alonzo.AlonzoRewarding rwdAcnt, _)) -> handleRewardPtr rdmrIx (Alonzo.unAsItem rwdAcnt) rdmrMps
244+
Just (Left (Alonzo.AlonzoCertifying dcert, Just ptr')) ->
245+
if ptr == ptr'
246+
then handleCertPtr rdmrIx (toCert $ Alonzo.unAsItem dcert) rdmrMps
247+
else (rdmrMps, Nothing)
248+
Just (Left (Alonzo.AlonzoCertifying _, Nothing)) -> (rdmrMps, Nothing)
249+
Just (Right (ConwayMinting policyId)) -> (rdmrMps, Just $ Right $ unScriptHash $ policyID (Alonzo.unAsItem policyId))
250+
Just (Right (ConwaySpending txIn)) -> handleTxInPtr rdmrIx (Alonzo.unAsItem txIn) rdmrMps
251+
Just (Right (ConwayRewarding rwdAcnt)) -> handleRewardPtr rdmrIx (Alonzo.unAsItem rwdAcnt) rdmrMps
252+
Just (Right (ConwayCertifying dcert)) -> handleCertPtr rdmrIx (toCert $ Alonzo.unAsItem dcert) rdmrMps
253+
Just (Right (ConwayVoting _)) -> (rdmrMps, Nothing)
254+
Just (Right (ConwayProposing _)) -> (rdmrMps, Nothing)
237255
Nothing -> (rdmrMps, Nothing)
238256

257+
(tag, idx) = getPurpose ptr
239258
txRdmr =
240259
TxRedeemer
241260
{ txRedeemerMem = fromIntegral $ exUnitsMem exUnits
242261
, txRedeemerSteps = fromIntegral $ exUnitsSteps exUnits
243262
, txRedeemerFee = (`txscriptfee` exUnits) <$> mprices
244263
, txRedeemerPurpose = tag
245-
, txRedeemerIndex = index
264+
, txRedeemerIndex = fromIntegral idx
246265
, txRedeemerScriptHash = mScript
247266
, txRedeemerData = mkTxData (Alonzo.hashData dt, dt)
248267
}
249268

250-
handleTxInPtr :: Word64 -> ShelleyTx.TxIn StandardCrypto -> RedeemerMaps -> (RedeemerMaps, Maybe (Either TxIn ByteString))
269+
mkPurpose = \case
270+
Strict.SNothing -> Nothing
271+
Strict.SJust a -> toAlonzoPurpose txBody a
272+
273+
handleTxInPtr :: Word64 -> Ledger.TxIn StandardCrypto -> RedeemerMaps -> (RedeemerMaps, Maybe (Either TxIn ByteString))
251274
handleTxInPtr rdmrIx txIn mps = case Map.lookup txIn (rmInps mps) of
252275
Nothing -> (mps, Nothing)
253276
Just gtxIn ->
@@ -271,11 +294,11 @@ handleCertPtr rdmrIx dcert mps =
271294
data RedeemerMaps = RedeemerMaps
272295
{ rmWdrl :: Map (Shelley.RewardAcnt StandardCrypto) TxWithdrawal
273296
, rmCerts :: [(Cert, TxCertificate)]
274-
, rmInps :: Map (ShelleyTx.TxIn StandardCrypto) TxIn
297+
, rmInps :: Map (Ledger.TxIn StandardCrypto) TxIn
275298
}
276299

277300
mkTxScript ::
278-
(Ledger.Era era) =>
301+
DBPlutusScript era =>
279302
(ScriptHash StandardCrypto, Alonzo.AlonzoScript era) ->
280303
TxScript
281304
mkTxScript (hsh, script) =
@@ -291,9 +314,7 @@ mkTxScript (hsh, script) =
291314
getScriptType =
292315
case script of
293316
Alonzo.TimelockScript {} -> Timelock
294-
Alonzo.PlutusScript (Plutus Alonzo.PlutusV1 _s) -> PlutusV1
295-
Alonzo.PlutusScript (Plutus Alonzo.PlutusV2 _s) -> PlutusV2
296-
Alonzo.PlutusScript (Plutus Alonzo.PlutusV3 _s) -> PlutusV3
317+
Alonzo.PlutusScript ps -> getPlutusScriptType ps
297318

298319
timelockJsonScript :: Maybe ByteString
299320
timelockJsonScript =
@@ -313,6 +334,7 @@ getPlutusSizes ::
313334
( Core.EraTx era
314335
, Core.TxWits era ~ Alonzo.AlonzoTxWits era
315336
, Core.Script era ~ Alonzo.AlonzoScript era
337+
, AlonzoEraScript era
316338
) =>
317339
Core.Tx era ->
318340
[Word64]
@@ -322,11 +344,12 @@ getPlutusSizes tx =
322344
tx ^. (Core.witsTxL . Alonzo.scriptAlonzoTxWitsL)
323345

324346
-- | Returns Nothing for non-plutus scripts.
325-
getPlutusScriptSize :: Alonzo.AlonzoScript era -> Maybe Word64
347+
getPlutusScriptSize :: AlonzoEraScript era => Alonzo.AlonzoScript era -> Maybe Word64
326348
getPlutusScriptSize script =
327349
case script of
328350
Alonzo.TimelockScript {} -> Nothing
329-
Alonzo.PlutusScript (Plutus _lang sbs) -> Just $ fromIntegral (SBS.length $ unBinaryPlutus sbs)
351+
Alonzo.PlutusScript ps ->
352+
Just $ fromIntegral $ SBS.length $ unPlutusBinary $ Alonzo.plutusScriptBinary ps
330353

331354
txDataWitness ::
332355
(Core.TxWits era ~ Alonzo.AlonzoTxWits era, Core.EraTx era, EraCrypto era ~ StandardCrypto) =>

0 commit comments

Comments
 (0)