Skip to content

Commit 1bd37de

Browse files
lehinslehins
committed
WIP-FullTx
1 parent 88ef972 commit 1bd37de

File tree

15 files changed

+70
-70
lines changed

15 files changed

+70
-70
lines changed

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Mempool.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,24 @@ class
111111
Globals ->
112112
MempoolEnv era ->
113113
MempoolState era ->
114-
Tx era ->
115-
Either (ApplyTxError era) (MempoolState era, Validated (Tx era))
114+
Tx FullTx era ->
115+
Either (ApplyTxError era) (MempoolState era, Validated (Tx FullTx era))
116116

117117
ruleApplyTxValidation ::
118118
forall rule era.
119119
( STS (EraRule rule era)
120120
, BaseM (EraRule rule era) ~ ShelleyBase
121121
, Environment (EraRule rule era) ~ LedgerEnv era
122122
, State (EraRule rule era) ~ MempoolState era
123-
, Signal (EraRule rule era) ~ Tx era
123+
, Signal (EraRule rule era) ~ Tx FullTx era
124124
, PredicateFailure (EraRule rule era) ~ PredicateFailure (EraRule "LEDGER" era)
125125
) =>
126126
ValidationPolicy ->
127127
Globals ->
128128
MempoolEnv era ->
129129
MempoolState era ->
130-
Tx era ->
131-
Either (ApplyTxError era) (MempoolState era, Validated (Tx era))
130+
Tx FullTx era ->
131+
Either (ApplyTxError era) (MempoolState era, Validated (Tx FullTx era))
132132
ruleApplyTxValidation validationPolicy globals env state tx =
133133
let opts =
134134
ApplySTSOpts
@@ -254,8 +254,8 @@ applyTx ::
254254
Globals ->
255255
MempoolEnv era ->
256256
MempoolState era ->
257-
Tx era ->
258-
Either (ApplyTxError era) (MempoolState era, Validated (Tx era))
257+
Tx FullTx era ->
258+
Either (ApplyTxError era) (MempoolState era, Validated (Tx FullTx era))
259259
applyTx = applyTxValidation ValidateAll
260260

261261
-- | Reapply a previously validated 'Tx'.
@@ -269,7 +269,7 @@ reapplyTx ::
269269
Globals ->
270270
MempoolEnv era ->
271271
MempoolState era ->
272-
Validated (Tx era) ->
272+
Validated (Tx FullTx era) ->
273273
Either (ApplyTxError era) (MempoolState era)
274274
reapplyTx globals env state (Validated tx) =
275275
fst <$> applyTxValidation (ValidateSuchThat (notElem lblStatic)) globals env state tx

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Wallet.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ getRewardProvenance globals newEpochState =
431431
-- Transaction helpers
432432
--------------------------------------------------------------------------------
433433

434-
addKeyWitnesses :: EraTx era => Tx era -> Set (WitVKey 'Witness) -> Tx era
434+
addKeyWitnesses :: EraTx era => Tx t era -> Set (WitVKey 'Witness) -> Tx t era
435435
addKeyWitnesses tx newWits = tx & witsTxL . addrTxWitsL %~ Set.union newWits
436436

437437
--------------------------------------------------------------------------------

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/AdaPots.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ instance Show Produced where
135135
-- | Compute the Coin part of what is consumed by a TxBody, itemized as a 'Consume'
136136
consumedTxBody ::
137137
(EraTxBody era, EraCertState era) =>
138-
TxBody era ->
138+
TxBody t era ->
139139
PParams era ->
140140
CertState era ->
141141
UTxO era ->
@@ -151,7 +151,7 @@ consumedTxBody txBody pp dpstate utxo =
151151
-- | Compute the Coin part of what is produced by a TxBody, itemized as a 'Produced'
152152
producedTxBody ::
153153
(EraTxBody era, EraCertState era) =>
154-
TxBody era ->
154+
TxBody FullTx era ->
155155
PParams era ->
156156
CertState era ->
157157
Produced

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/BlockBody.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ module Cardano.Ledger.Shelley.BlockBody (
1313
) where
1414

1515
import Cardano.Crypto.Hash (Hash)
16-
import Cardano.Ledger.Core (EraIndependentBlockBody, HASH, Tx)
16+
import Cardano.Ledger.Core (EraIndependentBlockBody, FullTx, HASH, Tx)
1717
import Cardano.Ledger.Shelley.BlockBody.Internal
1818
import Data.Sequence.Strict (StrictSeq)
1919

2020
shelleyBlockBodyHash :: ShelleyBlockBody era -> Hash HASH EraIndependentBlockBody
2121
shelleyBlockBodyHash = sbbHash
2222

23-
shelleyBlockBodyTxs :: ShelleyBlockBody era -> StrictSeq (Tx era)
23+
shelleyBlockBodyTxs :: ShelleyBlockBody era -> StrictSeq (Tx FullTx era)
2424
shelleyBlockBodyTxs = sbbTxs

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/BlockBody/Internal.hs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ txSeqBlockBodyShelleyL ::
116116
, SafeToHash (TxWits era)
117117
, BlockBody era ~ ShelleyBlockBody era
118118
) =>
119-
Lens' (BlockBody era) (StrictSeq (Tx era))
119+
Lens' (BlockBody era) (StrictSeq (Tx FullTx era))
120120
txSeqBlockBodyShelleyL = lens sbbTxs (\_ s -> ShelleyBlockBody s)
121121
{-# INLINEABLE txSeqBlockBodyShelleyL #-}
122122

@@ -129,29 +129,29 @@ deriving via
129129
]
130130
(ShelleyBlockBody era)
131131
instance
132-
(Typeable era, NoThunks (Tx era)) => NoThunks (ShelleyBlockBody era)
132+
(Typeable era, NoThunks (Tx FullTx era)) => NoThunks (ShelleyBlockBody era)
133133

134134
deriving stock instance
135-
Show (Tx era) =>
135+
Show (Tx FullTx era) =>
136136
Show (ShelleyBlockBody era)
137137

138138
deriving stock instance
139-
Eq (Tx era) =>
139+
Eq (Tx FullTx era) =>
140140
Eq (ShelleyBlockBody era)
141141

142142
-- ===========================
143143
-- Getting bytes from pieces of a Tx
144144

145145
coreWitnessBytes ::
146146
(EraTx era, SafeToHash (TxWits era)) =>
147-
Tx era ->
147+
Tx FullTx era ->
148148
ByteString
149149
coreWitnessBytes tx = originalBytes $ tx ^. witsTxL
150150

151-
coreBodyBytes :: EraTx era => Tx era -> ByteString
151+
coreBodyBytes :: EraTx era => Tx FullTx era -> ByteString
152152
coreBodyBytes tx = originalBytes $ tx ^. bodyTxL
153153

154-
coreAuxDataBytes :: EraTx era => Tx era -> StrictMaybe ByteString
154+
coreAuxDataBytes :: EraTx era => Tx FullTx era -> StrictMaybe ByteString
155155
coreAuxDataBytes tx = originalBytes <$> tx ^. auxDataTxL
156156

157157
-- ===========================
@@ -162,7 +162,7 @@ pattern ShelleyBlockBody ::
162162
( EraTx era
163163
, SafeToHash (TxWits era)
164164
) =>
165-
StrictSeq (Tx era) ->
165+
StrictSeq (Tx FullTx era) ->
166166
ShelleyBlockBody era
167167
pattern ShelleyBlockBody xs <-
168168
ShelleyBlockBodyInternal xs _ _ _ _
@@ -238,7 +238,7 @@ auxDataSeqDecoder bodiesLength auxDataMap = do
238238
instance
239239
( EraTx era
240240
, DecCBOR (Annotator (TxAuxData era))
241-
, DecCBOR (Annotator (TxBody era))
241+
, DecCBOR (Annotator (TxBody FullTx era))
242242
, DecCBOR (Annotator (TxWits era))
243243
) =>
244244
DecCBOR (Annotator (ShelleyBlockBody era))

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Bbody.hs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,13 @@ instance
144144
( EraBlockBody era
145145
, Embed (EraRule "LEDGERS" era) (ShelleyBBODY era)
146146
, Environment (EraRule "LEDGERS" era) ~ ShelleyLedgersEnv era
147-
, Signal (EraRule "LEDGERS" era) ~ Seq (Tx era)
147+
, Signal (EraRule "LEDGERS" era) ~ Seq (Tx FullTx era)
148148
) =>
149149
STS (ShelleyBBODY era)
150150
where
151-
type
152-
State (ShelleyBBODY era) =
153-
ShelleyBbodyState era
151+
type State (ShelleyBBODY era) = ShelleyBbodyState era
154152

155-
type
156-
Signal (ShelleyBBODY era) =
157-
Block BHeaderView era
153+
type Signal (ShelleyBBODY era) = Block BHeaderView era
158154

159155
type Environment (ShelleyBBODY era) = BbodyEnv era
160156

@@ -173,7 +169,7 @@ bbodyTransition ::
173169
, EraBlockBody era
174170
, Embed (EraRule "LEDGERS" era) (ShelleyBBODY era)
175171
, Environment (EraRule "LEDGERS" era) ~ ShelleyLedgersEnv era
176-
, Signal (EraRule "LEDGERS" era) ~ Seq (Tx era)
172+
, Signal (EraRule "LEDGERS" era) ~ Seq (Tx FullTx era)
177173
) =>
178174
TransitionRule (ShelleyBBODY era)
179175
bbodyTransition =

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Delegs.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ data DelegsEnv era = DelegsEnv
8282
-- ^ Lazy on purpose, because not all certificates need to know the current EpochNo
8383
, delegsIx :: TxIx
8484
, delegspp :: PParams era
85-
, delegsTx :: Tx era
85+
, delegsTx :: Tx FullTx era
8686
, delegsAccount :: ChainAccountState
8787
}
8888

8989
deriving stock instance
90-
( Show (Tx era)
90+
( Show (Tx FullTx era)
9191
, Show (PParams era)
9292
) =>
9393
Show (DelegsEnv era)

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledger.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ instance
256256
, Embed (EraRule "UTXOW" era) (ShelleyLEDGER era)
257257
, Environment (EraRule "UTXOW" era) ~ UtxoEnv era
258258
, State (EraRule "UTXOW" era) ~ UTxOState era
259-
, Signal (EraRule "UTXOW" era) ~ Tx era
259+
, Signal (EraRule "UTXOW" era) ~ Tx FullTx era
260260
, Environment (EraRule "DELEGS" era) ~ DelegsEnv era
261261
, State (EraRule "DELEGS" era) ~ CertState era
262262
, Signal (EraRule "DELEGS" era) ~ Seq (TxCert era)
@@ -265,7 +265,7 @@ instance
265265
STS (ShelleyLEDGER era)
266266
where
267267
type State (ShelleyLEDGER era) = LedgerState era
268-
type Signal (ShelleyLEDGER era) = Tx era
268+
type Signal (ShelleyLEDGER era) = Tx FullTx era
269269
type Environment (ShelleyLEDGER era) = LedgerEnv era
270270
type BaseM (ShelleyLEDGER era) = ShelleyBase
271271
type PredicateFailure (ShelleyLEDGER era) = ShelleyLedgerPredFailure era
@@ -289,7 +289,7 @@ ledgerTransition ::
289289
, Embed (EraRule "UTXOW" era) (ShelleyLEDGER era)
290290
, Environment (EraRule "UTXOW" era) ~ UtxoEnv era
291291
, State (EraRule "UTXOW" era) ~ UTxOState era
292-
, Signal (EraRule "UTXOW" era) ~ Tx era
292+
, Signal (EraRule "UTXOW" era) ~ Tx FullTx era
293293
) =>
294294
TransitionRule (ShelleyLEDGER era)
295295
ledgerTransition = do
@@ -341,7 +341,7 @@ renderDepositEqualsObligationViolation ::
341341
, EraGov era
342342
, EraCertState era
343343
, Environment t ~ LedgerEnv era
344-
, Signal t ~ Tx era
344+
, Signal t ~ Tx FullTx era
345345
, State t ~ LedgerState era
346346
) =>
347347
AssertionViolation t ->

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledgers.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ instance
164164
, Embed (EraRule "LEDGER" era) (ShelleyLEDGERS era)
165165
, Environment (EraRule "LEDGER" era) ~ LedgerEnv era
166166
, State (EraRule "LEDGER" era) ~ LedgerState era
167-
, Signal (EraRule "LEDGER" era) ~ Tx era
167+
, Signal (EraRule "LEDGER" era) ~ Tx FullTx era
168168
, Default (LedgerState era)
169169
) =>
170170
STS (ShelleyLEDGERS era)
171171
where
172172
type State (ShelleyLEDGERS era) = LedgerState era
173-
type Signal (ShelleyLEDGERS era) = Seq (Tx era)
173+
type Signal (ShelleyLEDGERS era) = Seq (Tx FullTx era)
174174
type Environment (ShelleyLEDGERS era) = ShelleyLedgersEnv era
175175
type BaseM (ShelleyLEDGERS era) = ShelleyBase
176176
type PredicateFailure (ShelleyLEDGERS era) = ShelleyLedgersPredFailure era
@@ -183,7 +183,7 @@ ledgersTransition ::
183183
( Embed (EraRule "LEDGER" era) (ShelleyLEDGERS era)
184184
, Environment (EraRule "LEDGER" era) ~ LedgerEnv era
185185
, State (EraRule "LEDGER" era) ~ LedgerState era
186-
, Signal (EraRule "LEDGER" era) ~ Tx era
186+
, Signal (EraRule "LEDGER" era) ~ Tx FullTx era
187187
) =>
188188
TransitionRule (ShelleyLEDGERS era)
189189
ledgersTransition = do

‎eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Reports.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ showKeyHash (KeyHash hash) = take 10 (show hash)
4040
showCerts :: Show (TxCert era) => [TxCert era] -> String
4141
showCerts certs = unlines (map ((" " ++) . show) certs)
4242

43-
showTxCerts :: EraTxBody era => TxBody era -> String
44-
showTxCerts txb = case (toList (txb ^. certsTxBodyL)) of
45-
[] -> ("No TxCerts in this TxBody\n" ++ show txb)
43+
showTxCerts :: EraTxBody era => TxBody t era -> String
44+
showTxCerts txb = case toList (txb ^. certsTxBodyL) of
45+
[] -> "No TxCerts in this TxBody\n" ++ show txb
4646
certs -> showCerts certs
4747

4848
-- | Display a synopsis of a map to Coin
@@ -58,7 +58,7 @@ produceEqualsConsumed ::
5858
PParams era ->
5959
CertState era ->
6060
UTxO era ->
61-
TxBody era ->
61+
TxBody FullTx era ->
6262
String
6363
produceEqualsConsumed pp dpstate utxo txb =
6464
let consumedValue = consumedTxBody txb pp dpstate utxo

0 commit comments

Comments
 (0)