Merge pull request #919 from IntersectMBO/cl/stakereganddeleg

Cl/stakereganddeleg

cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs

@@ -59,6 +59,25 @@ data StakeAddressCmds era
       StakeIdentifier
       (Maybe Coin)
       (File () Out)
+  | StakeAddressRegistrationAndDelegationCertificateCmd
+      (ConwayEraOnwards era)
+      StakeIdentifier
+      (VerificationKeyOrHashOrFile StakePoolKey)
+      Coin
+      (File () Out)
+  | StakeAddressRegistrationAndVoteDelegationCertificateCmd
+      (ConwayEraOnwards era)
+      StakeIdentifier
+      VoteDelegationTarget
+      Coin
+      (File () Out)
+  | StakeAddressRegistrationStakeAndVoteDelegationCertificateCmd
+      (ConwayEraOnwards era)
+      StakeIdentifier
+      (VerificationKeyOrHashOrFile StakePoolKey)
+      VoteDelegationTarget
+      Coin
+      (File () Out)
   deriving Show
 
 renderStakeAddressCmds :: StakeAddressCmds era -> Text
@@ -71,3 +90,6 @@ renderStakeAddressCmds = \case
   StakeAddressStakeAndVoteDelegationCertificateCmd{} -> "stake-address stake-and-vote-delegation-certificate"
   StakeAddressStakeDelegationCertificateCmd{} -> "stake-address stake-delegation-certificate"
   StakeAddressVoteDelegationCertificateCmd{} -> "stake-address vote-delegation-certificate"
+  StakeAddressRegistrationAndDelegationCertificateCmd{} -> "stake-address registration-and-stake-delegation-certificate"
+  StakeAddressRegistrationAndVoteDelegationCertificateCmd{} -> "stake-address registration-and-vote-delegation-certificate"
+  StakeAddressRegistrationStakeAndVoteDelegationCertificateCmd{} -> "stake-address registration-stake-and-vote-delegation-certificate"

cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs

@@ -36,6 +36,9 @@ pStakeAddressCmds era envCli =
     , pStakeAddressStakeDelegationCertificateCmd era
     , pStakeAddressStakeAndVoteDelegationCertificateCmd era
     , pStakeAddressVoteDelegationCertificateCmd era
+    , pStakeAddressRegistrationAndDelegationCertificateCmd era
+    , pStakeAddressRegistrationAndVoteDelegationCertificateCmd era
+    , pStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd era
     ]
 
 pStakeAddressKeyGenCmd
@@ -206,3 +209,67 @@ pStakeAddressVoteDelegationCertificateCmd era = do
       [ "Create a stake address vote delegation certificate, which when submitted in a transaction "
       , "delegates stake to a DRep."
       ]
+
+pStakeAddressRegistrationAndDelegationCertificateCmd
+  :: ()
+  => CardanoEra era
+  -> Maybe (Parser (StakeAddressCmds era))
+pStakeAddressRegistrationAndDelegationCertificateCmd era = do
+  w <- forEraMaybeEon era
+  pure
+    $ subParser "registration-and-delegation-certificate"
+    $ Opt.info
+      ( StakeAddressRegistrationAndDelegationCertificateCmd w
+          <$> pStakeIdentifier Nothing
+          <*> pStakePoolVerificationKeyOrHashOrFile Nothing
+          <*> pKeyRegistDeposit
+          <*> pOutputFile
+      )
+    $ Opt.progDesc
+    $ mconcat
+      [ "Create a stake address registration and delegation certificate, which when submitted in a transaction "
+      , "registers a stake address and delegates stake to a stake pool."
+      ]
+
+pStakeAddressRegistrationAndVoteDelegationCertificateCmd
+  :: ()
+  => CardanoEra era
+  -> Maybe (Parser (StakeAddressCmds era))
+pStakeAddressRegistrationAndVoteDelegationCertificateCmd era = do
+  w <- forEraMaybeEon era
+  pure
+    $ subParser "registration-and-vote-delegation-certificate"
+    $ Opt.info
+      ( StakeAddressRegistrationAndVoteDelegationCertificateCmd w
+          <$> pStakeIdentifier Nothing
+          <*> pVoteDelegationTarget
+          <*> pKeyRegistDeposit
+          <*> pOutputFile
+      )
+    $ Opt.progDesc
+    $ mconcat
+      [ "Create a stake address registration and vote delegation certificate, which when submitted in a transaction "
+      , "registers a stake address and delegates votes to a DRep or pre-defined voting option."
+      ]
+
+pStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd
+  :: ()
+  => CardanoEra era
+  -> Maybe (Parser (StakeAddressCmds era))
+pStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd era = do
+  w <- forEraMaybeEon era
+  pure
+    $ subParser "registration-stake-and-vote-delegation-certificate"
+    $ Opt.info
+      ( StakeAddressRegistrationStakeAndVoteDelegationCertificateCmd w
+          <$> pStakeIdentifier Nothing
+          <*> pStakePoolVerificationKeyOrHashOrFile Nothing
+          <*> pVoteDelegationTarget
+          <*> pKeyRegistDeposit
+          <*> pOutputFile
+      )
+    $ Opt.progDesc
+    $ mconcat
+      [ "Create a stake address registration, stake delegation and vote delegation certificate, which when submitted in a transaction "
+      , "registers a stake address, delgates stake to a pool, and delegates votes to a DRep or pre-defined voting option."
+      ]

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

@@ -15,6 +15,8 @@ module Cardano.CLI.EraBased.Run.StakeAddress
   , runStakeAddressStakeDelegationCertificateCmd
   , runStakeAddressDeregistrationCertificateCmd
   , runStakeAddressRegistrationCertificateCmd
+  , runStakeAddressRegistrationAndDelegationCertificateCmd
+  , runStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd
   )
 where
 
@@ -67,6 +69,44 @@ runStakeAddressCmds = \case
     runStakeAddressVoteDelegationCertificateCmd w stakeIdentifier voteDelegationTarget outputFp
   StakeAddressDeregistrationCertificateCmd sbe stakeIdentifier mDeposit outputFp ->
     runStakeAddressDeregistrationCertificateCmd sbe stakeIdentifier mDeposit outputFp
+  StakeAddressRegistrationAndDelegationCertificateCmd
+    w
+    stakeIdentifier
+    poolVKeyOrHashOrFile
+    deposit
+    outFp ->
+      runStakeAddressRegistrationAndDelegationCertificateCmd
+        w
+        stakeIdentifier
+        poolVKeyOrHashOrFile
+        deposit
+        outFp
+  StakeAddressRegistrationAndVoteDelegationCertificateCmd
+    w
+    stakeIdentifier
+    voteDelegationTarget
+    keydeposit
+    outFp ->
+      runStakeAddressRegistrationAndVoteDelegationCertificateCmd
+        w
+        stakeIdentifier
+        voteDelegationTarget
+        keydeposit
+        outFp
+  StakeAddressRegistrationStakeAndVoteDelegationCertificateCmd
+    w
+    stakeIdentifier
+    poolVKeyOrHashOrFile
+    voteDelegationTarget
+    keydeposit
+    outFp ->
+      runStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd
+        w
+        stakeIdentifier
+        poolVKeyOrHashOrFile
+        voteDelegationTarget
+        keydeposit
+        outFp
 
 runStakeAddressKeyGenCmd
   :: ()
@@ -325,3 +365,96 @@ runStakeAddressDeregistrationCertificateCmd sbe stakeVerifier mDeposit oFp = do
  where
   deregCertDesc :: TextEnvelopeDescr
   deregCertDesc = "Stake Address Deregistration Certificate"
+
+runStakeAddressRegistrationAndDelegationCertificateCmd
+  :: ()
+  => ConwayEraOnwards era
+  -> StakeIdentifier
+  -> VerificationKeyOrHashOrFile StakePoolKey
+  -- ^ Delegatee stake pool verification key or verification key file or id
+  -> Lovelace
+  -> File () Out
+  -> ExceptT StakeAddressCmdError IO ()
+runStakeAddressRegistrationAndDelegationCertificateCmd w stakeVerifier poolVKeyOrHashOrFile deposit outFp =
+  conwayEraOnwardsConstraints w $ do
+    StakePoolKeyHash poolStakeVKeyHash <-
+      modifyError StakeAddressCmdReadKeyFileError $
+        readVerificationKeyOrHashOrFile AsStakePoolKey poolVKeyOrHashOrFile
+
+    stakeCred <-
+      getStakeCredentialFromIdentifier stakeVerifier
+        & firstExceptT StakeAddressCmdStakeCredentialError
+
+    let delegatee = L.DelegStake poolStakeVKeyHash
+
+    let certificate = makeStakeAddressAndDRepDelegationCertificate w stakeCred delegatee deposit
+
+    firstExceptT StakeAddressCmdWriteFileError
+      . newExceptT
+      $ writeLazyByteStringFile outFp
+      $ textEnvelopeToJSON
+        (Just @TextEnvelopeDescr "Stake address registration and stake delegation certificate")
+        certificate
+
+runStakeAddressRegistrationAndVoteDelegationCertificateCmd
+  :: ()
+  => ConwayEraOnwards era
+  -> StakeIdentifier
+  -> VoteDelegationTarget
+  -> Lovelace
+  -> File () Out
+  -> ExceptT StakeAddressCmdError IO ()
+runStakeAddressRegistrationAndVoteDelegationCertificateCmd w stakeVerifier voteDelegationTarget keydeposit outFp =
+  conwayEraOnwardsConstraints w $ do
+    stakeCred <-
+      getStakeCredentialFromIdentifier stakeVerifier
+        & firstExceptT StakeAddressCmdStakeCredentialError
+
+    drep <-
+      readVoteDelegationTarget voteDelegationTarget
+        & firstExceptT StakeAddressCmdDelegationError
+
+    let delegatee = L.DelegVote drep
+
+    let certificate = makeStakeAddressAndDRepDelegationCertificate w stakeCred delegatee keydeposit
+
+    firstExceptT StakeAddressCmdWriteFileError
+      . newExceptT
+      $ writeLazyByteStringFile outFp
+      $ textEnvelopeToJSON
+        (Just @TextEnvelopeDescr "Stake address registration and vote delegation certificate")
+        certificate
+
+runStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd
+  :: ()
+  => ConwayEraOnwards era
+  -> StakeIdentifier
+  -> VerificationKeyOrHashOrFile StakePoolKey
+  -> VoteDelegationTarget
+  -> Lovelace
+  -> File () Out
+  -> ExceptT StakeAddressCmdError IO ()
+runStakeAddressRegistrationStakeAndVoteDelegationCertificateCmd w stakeVerifier poolVKeyOrHashOrFile voteDelegationTarget keydeposit outFp =
+  conwayEraOnwardsConstraints w $ do
+    StakePoolKeyHash poolStakeVKeyHash <-
+      modifyError StakeAddressCmdReadKeyFileError $
+        readVerificationKeyOrHashOrFile AsStakePoolKey poolVKeyOrHashOrFile
+
+    stakeCred <-
+      getStakeCredentialFromIdentifier stakeVerifier
+        & firstExceptT StakeAddressCmdStakeCredentialError
+
+    drep <-
+      readVoteDelegationTarget voteDelegationTarget
+        & firstExceptT StakeAddressCmdDelegationError
+
+    let delegatee = L.DelegStakeVote poolStakeVKeyHash drep
+
+    let certificate = makeStakeAddressAndDRepDelegationCertificate w stakeCred delegatee keydeposit
+
+    firstExceptT StakeAddressCmdWriteFileError
+      . newExceptT
+      $ writeLazyByteStringFile outFp
+      $ textEnvelopeToJSON
+        (Just @TextEnvelopeDescr "Stake address registration and vote delegation certificate")
+        certificate

cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/StakeAddress.hs

@@ -130,3 +130,93 @@ hprop_golden_conway_stakeaddress_delegate_pool_and_drep =
         ]
 
     H.diffFileVsGoldenFile delegFile delegGold
+
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden conway stakeaddress register and delegate pool/"'@
+hprop_golden_conway_stakeaddress_register_and_delegate_pool :: Property
+hprop_golden_conway_stakeaddress_register_and_delegate_pool =
+  propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
+    vkeyFile <- noteInputFile "test/cardano-cli-golden/files/input/conway/stake.vkey"
+    vkeyPool <- noteInputFile "test/cardano-cli-golden/files/input/conway/poolCold.vkey"
+    certFile <- H.noteTempFile tempDir "cert"
+    certGold <-
+      H.note
+        "test/cardano-cli-golden/files/golden/governance/stakeaddress/registerAddressDelegateToPool.cert"
+
+    void $
+      execCardanoCLI
+        [ "conway"
+        , "stake-address"
+        , "registration-and-delegation-certificate"
+        , "--stake-verification-key-file"
+        , vkeyFile
+        , "--cold-verification-key-file"
+        , vkeyPool
+        , "--key-reg-deposit-amt"
+        , "2000000"
+        , "--out-file"
+        , certFile
+        ]
+
+    H.diffFileVsGoldenFile certFile certGold
+
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden conway stakeaddress register and delegate vote/"'@
+hprop_golden_conway_stakeaddress_register_and_delegate_vote :: Property
+hprop_golden_conway_stakeaddress_register_and_delegate_vote =
+  propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
+    vkeyFile <- noteInputFile "test/cardano-cli-golden/files/input/conway/stake.vkey"
+    vkeyDrepFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/drep/drep.vkey"
+    certFile <- H.noteTempFile tempDir "cert"
+    certGold <-
+      H.note
+        "test/cardano-cli-golden/files/golden/governance/stakeaddress/registerAddressDelegateToDrep.cert"
+
+    void $
+      execCardanoCLI
+        [ "conway"
+        , "stake-address"
+        , "registration-and-vote-delegation-certificate"
+        , "--stake-verification-key-file"
+        , vkeyFile
+        , "--drep-verification-key-file"
+        , vkeyDrepFile
+        , "--key-reg-deposit-amt"
+        , "2000000"
+        , "--out-file"
+        , certFile
+        ]
+
+    H.diffFileVsGoldenFile certFile certGold
+
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden conway stakeaddress register and delegate stake and vote/"'@
+hprop_golden_conway_stakeaddress_register_and_delegate_stake_and_vote :: Property
+hprop_golden_conway_stakeaddress_register_and_delegate_stake_and_vote =
+  propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
+    vkeyFile <- noteInputFile "test/cardano-cli-golden/files/input/conway/stake.vkey"
+    vkeyPool <- noteInputFile "test/cardano-cli-golden/files/input/conway/poolCold.vkey"
+    vkeyDrepFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/drep/drep.vkey"
+    certFile <- H.noteTempFile tempDir "cert"
+    certGold <-
+      H.note
+        "test/cardano-cli-golden/files/golden/governance/stakeaddress/registerAddressDelegateToPoolAndDrep.cert"
+
+    void $
+      execCardanoCLI
+        [ "conway"
+        , "stake-address"
+        , "registration-stake-and-vote-delegation-certificate"
+        , "--stake-verification-key-file"
+        , vkeyFile
+        , "--cold-verification-key-file"
+        , vkeyPool
+        , "--drep-verification-key-file"
+        , vkeyDrepFile
+        , "--key-reg-deposit-amt"
+        , "2000000"
+        , "--out-file"
+        , certFile
+        ]
+
+    H.diffFileVsGoldenFile certFile certGold

cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/registerAddressDelegateToDrep.cert

@@ -0,0 +1,5 @@
+{
+    "type": "CertificateConway",
+    "description": "Stake address registration and vote delegation certificate",
+    "cborHex": "840c8200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab018200581ce68f9ee70599cb93d9f60678f9c6463c01938c27d9820c7bf93887a51a001e8480"
+}

cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/registerAddressDelegateToPool.cert

@@ -0,0 +1,5 @@
+{
+    "type": "CertificateConway",
+    "description": "Stake address registration and stake delegation certificate",
+    "cborHex": "840b8200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab01581cc27cf021914a2b3bcb286d3d741979083422378c577fe757702b69881a001e8480"
+}

cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/registerAddressDelegateToPoolAndDrep.cert

@@ -0,0 +1,5 @@
+{
+    "type": "CertificateConway",
+    "description": "Stake address registration and vote delegation certificate",
+    "cborHex": "850d8200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab01581cc27cf021914a2b3bcb286d3d741979083422378c577fe757702b69888200581ce68f9ee70599cb93d9f60678f9c6463c01938c27d9820c7bf93887a51a001e8480"
+}