Minor fixups from internal audit

eras/babbage/impl/src/Cardano/Ledger/Babbage/Rules/Utxo.hs

@@ -261,12 +261,15 @@ validateTotalCollateral pp txBody utxoCollateral =
     bal = collAdaBalance txBody utxoCollateral
     fromAlonzoValidation = first (fmap injectFailure)
 
--- | This validation produces the same failure as in Alonzo, but is slightly
--- different then the corresponding one in Alonzo, since it is possible to add
--- non-ada collateral, but only if the same amount of the same multi-asset is
--- present in the collateral return output.
+-- | This validation produces the same failure as in Alonzo, but is slightly different
+-- then the corresponding one in Alonzo, due to addition of the collateral return output:
 --
--- > isAdaOnly balance
+-- 1. Collateral amount can be specified exactly, thus protecting user against unnecessary
+-- loss.
+--
+-- 2. Collateral inputs can contain multi-assets, as long all of them are returned to the
+-- `collateralReturnTxBodyL`. This design decision was also intentional, in order to
+-- simplify utxo selection for collateral.
 validateCollateralContainsNonADA ::
   forall era.
   BabbageEraTxBody era =>

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Epoch.hs

@@ -217,7 +217,7 @@ returnProposalDeposits removedProposals oldUMap =
               (RewDepUView um)
           , unclaimed
           )
-      | otherwise = (um, Map.insertWith (<>) (gasId gas) (gasDeposit gas) unclaimed)
+      | otherwise = (um, Map.insert (gasId gas) (gasDeposit gas) unclaimed)
     addReward c rd =
       -- Deposits have been validated at this point
       rd {rdReward = rdReward rd <> compactCoinOrError c}

libs/cardano-ledger-core/src/Cardano/Ledger/CertState.hs

@@ -352,15 +352,16 @@ deriving newtype instance Era era => ToJSON (CommitteeState era)
 instance Era era => ToCBOR (CommitteeState era) where
   toCBOR = toEraCBOR @era
 
--- | The state that tracks the voting entities (DReps and Constitutional Committee members)
+-- | The state that tracks the voting entities (DReps and Constitutional Committee
+-- members). In the formal ledger specification this type is called @GState@
 data VState era = VState
   { vsDReps ::
       !( Map
           (Credential 'DRepRole (EraCrypto era))
           (DRepState (EraCrypto era))
        )
   , vsCommitteeState :: !(CommitteeState era)
-  , vsNumDormantEpochs :: EpochNo
+  , vsNumDormantEpochs :: !EpochNo
   -- ^ Number of contiguous epochs in which there are exactly zero
   -- active governance proposals to vote on. It is incremented in every
   -- EPOCH rule if the number of active governance proposals to vote on