Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Perpetuate Ord bug (which was fixed in #2419) until Alonzo #2432

Merged
merged 1 commit into from
Aug 24, 2021
Merged

Perpetuate Ord bug (which was fixed in #2419) until Alonzo #2432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Tx.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,12 @@ instance
where
fromCBOR = decodeWits

newtype IgnoreSigOrd kr crypto = IgnoreSigOrd {unIgnoreSigOrd :: WitVKey kr crypto}
deriving (Eq)

instance (Typeable kr, CC.Crypto crypto) => Ord (IgnoreSigOrd kr crypto) where
compare (IgnoreSigOrd w1) (IgnoreSigOrd w2) = compare (witKeyHash w1) (witKeyHash w2)

decodeWits ::
forall era s.
( FromCBOR (Annotator (Core.Script era)),
Expand All @@ -473,7 +479,13 @@ decodeWits = do
decodeWord >>= \case
0 ->
decodeList fromCBOR >>= \x ->
pure (\ws -> ws {addrWits' = Set.fromList <$> sequence x})
pure
( \ws ->
ws
{ addrWits' =
Set.map unIgnoreSigOrd . Set.fromList . fmap IgnoreSigOrd <$> sequence x
}
)
1 ->
decodeList fromCBOR >>= \x ->
pure (\ws -> ws {scriptWits' = keyBy (hashScript @era) <$> sequence x})
Expand Down