address PR review comments

Author: williamdemeo

CHANGELOG.md

@@ -4,7 +4,6 @@
 
 ### WIP
 
-- Add abstract BLS primitives and a strict total order on key hashes to `CryptoStructure`, and the voting-key expiry period `BlsKeyMaxAgeᶜ` to `GlobalConstants` (CIP-164).
 - Move cert-deposit helpers from `Utxo` to `Certs`.
 - Fix `updateCertDeposits`: use `foldl` (CERTS is head-first).
 - Add `HasCoin-UTxOState` and `HasCoin-LedgerState` instances; the latter sums UTxO total, rewards balance, and all three deposit fields.

src/Ledger/Core/Specification/Crypto.lagda.md

@@ -16,7 +16,6 @@ module Ledger.Core.Specification.Crypto where
 
 open import Ledger.Prelude hiding (T)
 open import Ledger.Prelude.Numeric.UnitInterval
-open import Relation.Binary using (IsStrictTotalOrder)
 
 record isHashableSet (T : Type) : Type₁ where
   constructor mkIsHashableSet
@@ -81,21 +80,6 @@ record CryptoStructure : Type₁ where
   field VRF : Type
         ⦃ DecEq-VRF ⦄ : DecEq VRF
 
-  -- Byte-wise ascending order on key hashes; the Leios committee tie-break.
-  field _<ᵏʰ_ : KeyHash → KeyHash → Type
-        <ᵏʰ-isSTO : IsStrictTotalOrder _≡_ _<ᵏʰ_
-        ⦃ Dec-<ᵏʰ ⦄ : _<ᵏʰ_ ⁇²
-
-  -- BLS12-381 signature scheme used for Leios voting (CIP-0164).
-  field BlsVKey BlsSig BlsPoP : Type
-        isValidPoP          : BlsVKey → BlsPoP → Type
-        isSignedByAggregate : List BlsVKey → Ser → BlsSig → Type
-        ⦃ DecEq-BlsVKey ⦄ : DecEq BlsVKey
-        ⦃ DecEq-BlsSig  ⦄ : DecEq BlsSig
-        ⦃ DecEq-BlsPoP  ⦄ : DecEq BlsPoP
-        ⦃ Dec-isValidPoP ⦄ : isValidPoP ⁇²
-        ⦃ Dec-isSignedByAggregate ⦄ : isSignedByAggregate ⁇³
-
 -- TODO: KES
 ```
 -->

src/Ledger/Dijkstra/Specification.lagda.md

@@ -56,6 +56,12 @@ import Ledger.Dijkstra.Specification.Chain
 import Ledger.Dijkstra.Specification.Chain.Properties
 ```
 
+## Abstract cryptographic primitives
+
+```agda
+import Ledger.Dijkstra.Specification.Crypto
+```
+
 ## Enactment
 
 ```agda

src/Ledger/Dijkstra/Specification/Crypto.lagda.md

@@ -0,0 +1,56 @@
+---
+source_branch: master
+source_path: src/Ledger/Dijkstra/Specification/Crypto.lagda.md
+---
+
+# Dijkstra Cryptographic Primitives
+
+<!--
+```agda
+
+{-# OPTIONS --safe #-}
+module Ledger.Dijkstra.Specification.Crypto where
+
+open import Ledger.Prelude
+open import Relation.Binary using (IsStrictTotalOrder)
+open import Ledger.Core.Specification.Crypto hiding (CryptoStructure)
+```
+-->
+
+In Leios the crypto structure includes a strict total order on key hashes, which
+is used to break ties when deciding which stakeholders get to join the committee.
+(See the [Epoch Boundary section] of [CIP-0164].)
+
+```agda
+record CryptoStructure : Type₁ where
+  field pkk : PKKScheme
+
+  open PKKScheme pkk public
+
+  field ⦃ khs ⦄    : isHashableSet VKey
+        ScriptHash : Type; ⦃ DecEq-ScriptHash ⦄ : DecEq ScriptHash ; ⦃ Show-ScriptHash ⦄ : Show ScriptHash
+
+  open isHashableSet khs renaming (THash to KeyHash) hiding (DecEq-T) public
+
+  field VRF : Type
+        ⦃ DecEq-VRF ⦄ : DecEq VRF
+
+  -- Byte-wise ascending order on key hashes; the Leios committee tie-break.
+  field _<ᵏʰ_ : KeyHash → KeyHash → Type
+        <ᵏʰ-isSTO : IsStrictTotalOrder _≡_ _<ᵏʰ_
+        ⦃ Dec-<ᵏʰ ⦄ : _<ᵏʰ_ ⁇²
+
+  -- BLS12-381 signature scheme used for Leios voting (CIP-0164).
+  field BlsVKey BlsSig BlsPoP : Type
+        isValidPoP          : BlsVKey → BlsPoP → Type
+        isSignedByAggregate : List BlsVKey → Ser → BlsSig → Type
+        ⦃ DecEq-BlsVKey ⦄ : DecEq BlsVKey
+        ⦃ DecEq-BlsSig  ⦄ : DecEq BlsSig
+        ⦃ DecEq-BlsPoP  ⦄ : DecEq BlsPoP
+        ⦃ Dec-isValidPoP ⦄ : isValidPoP ⁇²
+        ⦃ Dec-isSignedByAggregate ⦄ : isSignedByAggregate ⁇³
+
+```
+
+[CIP-0164]: https://github.com/cardano-scaling/CIPs/blob/leios/CIP-0164/README.md
+[Epoch Boundary section]: https://github.com/cardano-scaling/CIPs/blob/leios/CIP-0164/README.md#epoch-boundary