Fix compilation errors

Author: palas

cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs

@@ -28,8 +28,7 @@ import Cardano.Api.Consensus (ShelleyGenesisStaking (..))
 import Cardano.Api.Ledger (StrictMaybe (SNothing))
 import Cardano.Api.Ledger qualified as L
 import Cardano.Api.Shelley
-  ( AnyStakePoolVerificationKey (..)
-  , Hash (..)
+  ( Hash (..)
   , KESPeriod (KESPeriod)
   , OperationalCertificateIssueCounter (OperationalCertificateIssueCounter)
   , ShelleyGenesis
@@ -151,7 +150,7 @@ runGenesisKeyGenDelegateCmd
         textEnvelopeToJSON (Just certCtrDesc) $
           OperationalCertificateIssueCounter
             initialCounter
-            (AnyStakePoolNormalVerificationKey $ castVerificationKey vkey) -- Cast to a 'StakePoolKey'
+            (castVerificationKey vkey) -- Cast to a 'StakePoolKey'
    where
     skeyDesc, certCtrDesc :: TextEnvelopeDescr
     skeyDesc = "Genesis delegate operator key"

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs

@@ -340,11 +340,7 @@ generateShelleyNodeSecrets shelleyDelegateKeys shelleyGenesisvkeys = do
      where
       eResult = issueOperationalCertificate kesKey (Right delegateKey) (KESPeriod 0) counter
       counter =
-        OperationalCertificateIssueCounter
-          0
-          ( AnyStakePoolNormalVerificationKey . convertFun . getVerificationKey $
-              delegateKey
-          )
+        OperationalCertificateIssueCounter 0 (convertFun . getVerificationKey $ delegateKey)
       convertFun
         :: VerificationKey GenesisDelegateExtendedKey
         -> VerificationKey StakePoolKey

cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs

@@ -555,7 +555,7 @@ runQueryKesPeriodInfoCmd
       -- should be.
       let opCertCounterMap = Consensus.getOpCertCounters (Proxy @(ConsensusProtocol era)) chainDepState
           StakePoolKeyHash blockIssuerHash =
-            anyStakePoolVerificationKeyHash stakePoolVKey
+            verificationKeyHash stakePoolVKey
 
       case Map.lookup (coerce blockIssuerHash) opCertCounterMap of
         -- Operational certificate exists in the protocol state

cardano-cli/src/Cardano/CLI/EraIndependent/Node/Run.hs

@@ -82,8 +82,8 @@ runNodeKeyGenColdCmd
       . newExceptT
       $ writeLazyByteStringFile operationalCertificateIssueCounter
       $ textEnvelopeToJSON (Just ocertCtrDesc)
-      $ OperationalCertificateIssueCounter initialCounter
-      $ AnyStakePoolNormalVerificationKey
+      $ OperationalCertificateIssueCounter
+        initialCounter
         vkey
    where
     skeyDesc :: TextEnvelopeDescr
@@ -220,7 +220,13 @@ runNodeNewCounterCmd
         readColdVerificationKeyOrFile coldVkeyFile
 
     let ocertIssueCounter =
-          OperationalCertificateIssueCounter (fromIntegral counter) vkey
+          OperationalCertificateIssueCounter
+            (fromIntegral counter)
+            ( case vkey of
+                AnyStakePoolNormalVerificationKey normalStakePoolVKey -> normalStakePoolVKey
+                AnyStakePoolExtendedVerificationKey extendedStakePoolVKey ->
+                  castVerificationKey extendedStakePoolVKey
+            )
 
     firstExceptT NodeCmdWriteFileError . newExceptT $
       writeLazyByteStringFile (onlyOut mOutFile) $