Comment out verification key from op cert issue counter

Doing this temporarily in order to support the old op cert issue counter
file format.

Author: intricate

cardano-api/src/Cardano/Api/Typed.hs

@@ -867,7 +867,9 @@ data OperationalCertificate =
 data OperationalCertificateIssueCounter =
      OperationalCertificateIssueCounter
        !Natural
-       !(VerificationKey StakePoolKey) -- For consistency checking
+       -- TODO: Commenting this out as we're temporarily supporting the old op
+       -- cert issue counter format.
+       -- !(VerificationKey StakePoolKey) -- For consistency checking
   deriving (Eq, Show)
   deriving anyclass SerialiseAsCBOR
 
@@ -881,13 +883,20 @@ instance FromCBOR OperationalCertificate where
       return (OperationalCertificate ocert vkey)
 
 instance ToCBOR OperationalCertificateIssueCounter where
-    toCBOR (OperationalCertificateIssueCounter counter vkey) =
-      toCBOR (counter, vkey)
+    -- TODO: Commenting this out as we're temporarily supporting the old op
+    -- cert issue counter format.
+    -- toCBOR (OperationalCertificateIssueCounter counter vkey) =
+    --   toCBOR (counter, vkey)
+    toCBOR (OperationalCertificateIssueCounter counter) =
+      toCBOR counter
 
 instance FromCBOR OperationalCertificateIssueCounter where
-    fromCBOR = do
-      (counter, vkey) <- fromCBOR
-      return (OperationalCertificateIssueCounter counter vkey)
+    -- TODO: Commenting this out as we're temporarily supporting the old op
+    -- cert issue counter format.
+    -- fromCBOR = do
+    --   (counter, vkey) <- fromCBOR
+    --   return (OperationalCertificateIssueCounter counter vkey)
+    fromCBOR = OperationalCertificateIssueCounter <$> fromCBOR
 
 instance HasTypeProxy OperationalCertificate where
     data AsType OperationalCertificate = AsOperationalCertificate
@@ -929,13 +938,20 @@ issueOperationalCertificate :: VerificationKey KesKey
 issueOperationalCertificate (KesVerificationKey kesVKey)
                             (StakePoolSigningKey poolSKey)
                             kesPeriod
-                            (OperationalCertificateIssueCounter counter poolVKey)
-  | poolVKey /= poolVKey'
-  = Left (OperationalCertKeyMismatch poolVKey poolVKey')
-
-  | otherwise
-  = Right (OperationalCertificate ocert poolVKey,
-           OperationalCertificateIssueCounter (succ counter) poolVKey)
+                            -- TODO: Commenting this out as we're temporarily supporting the old op
+                            -- cert issue counter format.
+                            -- (OperationalCertificateIssueCounter counter poolVKey)
+                            (OperationalCertificateIssueCounter counter)
+  -- TODO: Commenting this out as we're temporarily supporting the old op
+  -- cert issue counter format.
+  -- \| poolVKey /= poolVKey'
+  -- = Left (OperationalCertKeyMismatch poolVKey poolVKey')
+  --
+  -- \| otherwise
+  -- = Right (OperationalCertificate ocert poolVKey,
+  --          OperationalCertificateIssueCounter (succ counter) poolVKey)
+    = Right (OperationalCertificate ocert poolVKey',
+             OperationalCertificateIssueCounter (succ counter))
   where
     poolVKey' = getVerificationKey (StakePoolSigningKey poolSKey)
 

cardano-api/test/Test/Cardano/Api/Typed/Gen.hs

@@ -59,7 +59,10 @@ genOperationalCertificateWithCounter = do
   kesP <- genKESPeriod
   c <- Gen.integral $ Range.linear 0 1000
   let stakePoolVer = getVerificationKey stakePoolSign
-      iCounter = OperationalCertificateIssueCounter c stakePoolVer
+      -- TODO: Commenting this out as we're temporarily supporting the old op
+      -- cert issue counter format.
+      -- iCounter = OperationalCertificateIssueCounter c stakePoolVer
+      iCounter = OperationalCertificateIssueCounter c
 
   case issueOperationalCertificate kesVKey stakePoolSign kesP iCounter of
     -- This case should be impossible as we clearly derive the verification

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

@@ -33,9 +33,8 @@ import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT
 import           Cardano.Api hiding (writeAddress)
 import           Cardano.Api.Typed (AsType (..), Error (..), FileError, Hash (..),
                    OperationalCertificateIssueCounter (..), TextEnvelopeError,
-                   VerificationKey, VrfKey, castVerificationKey, generateSigningKey,
-                   getVerificationKey, readFileTextEnvelope, verificationKeyHash,
-                   writeFileTextEnvelope)
+                   VerificationKey, VrfKey, generateSigningKey, getVerificationKey,
+                   readFileTextEnvelope, verificationKeyHash, writeFileTextEnvelope)
 
 import           Ouroboros.Consensus.BlockchainTime (SystemStart (..))
 import           Ouroboros.Consensus.Shelley.Protocol (TPraosStandardCrypto)
@@ -194,7 +193,9 @@ runGenesisKeyGenDelegate (VerificationKeyFile vkeyPath)
       $ writeFileTextEnvelope ocertCtrPath (Just ocertCtrDesc)
       $ OperationalCertificateIssueCounter
           initialCounter
-          (castVerificationKey vkey)  -- Cast to a 'StakePoolKey'
+          -- TODO: Commenting this out as we're temporarily supporting the old op
+          -- cert issue counter format.
+          -- (castVerificationKey vkey)  -- Cast to a 'StakePoolKey'
   where
     skeyDesc, vkeyDesc, ocertCtrDesc :: TextViewTitle
     skeyDesc = TextViewTitle "Genesis delegate operator key"

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

@@ -71,7 +71,10 @@ runNodeKeyGenCold (VerificationKeyFile vkeyPath) (SigningKeyFile skeyPath)
     firstExceptT ShelleyNodeWriteFileError
       . newExceptT
       $ writeFileTextEnvelope ocertCtrPath (Just ocertCtrDesc)
-      $ OperationalCertificateIssueCounter initialCounter vkey
+      -- TODO: Commenting this out as we're temporarily supporting the old op
+      -- cert issue counter format.
+      -- \$ OperationalCertificateIssueCounter initialCounter vkey
+      $ OperationalCertificateIssueCounter initialCounter
   where
     skeyDesc, vkeyDesc, ocertCtrDesc :: TextViewTitle
     skeyDesc = TextViewTitle "Stake Pool Operator Signing Key"
@@ -168,7 +171,10 @@ runNodeIssueOpCert (VerificationKeyFile vkeyKesPath)
       $ writeFileTextEnvelope certFile Nothing ocert
   where
     getCounter :: OperationalCertificateIssueCounter -> Natural
-    getCounter (OperationalCertificateIssueCounter n _) = n
+    -- TODO: Commenting this out as we're temporarily supporting the old op
+    -- cert issue counter format.
+    -- getCounter (OperationalCertificateIssueCounter n _) = n
+    getCounter (OperationalCertificateIssueCounter n) = n
 
     ocertCtrDesc :: Natural -> TextViewTitle
     ocertCtrDesc n = TextViewTitle $ "Next certificate issue number: " <> show n

cardano-cli/test/cli/node-issue-op-cert/data/delegate-op-cert.counter

@@ -1,4 +1,4 @@
 type: Node operational certificate issue counter
 title: Next certificate issue number: 6
 cbor-hex:
- 8206582074525f5cbbf5d3480459d3199fcd36aa8e29b1afa0d5bd67cf1b0495fe79bb13
+ 06