Merge pull request #3554 from input-output-hk/aniketd/pprocanchor-req…

…uired Make Anchor required in ProposalProcedure
IntersectMBO · Jul 20, 2023 · a86a2c6 · a86a2c6
2 parents 8731cbe + a11f48d
commit a86a2c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/eras/conway/impl/CHANGELOG.md b/eras/conway/impl/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.7.0.0
 
+* Make `Anchor` required in `ProposalProcedure`.
 * Removal of TxOuts with zero `Coin` from UTxO on translation
 * Rename:
  `cgTally` -> `cgGov`

diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/Governance/Procedures.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/Governance/Procedures.hs
@@ -270,7 +270,7 @@ data ProposalProcedure era = ProposalProcedure
  { pProcDeposit :: !Coin
  , pProcReturnAddr :: !(KeyHash 'Staking (EraCrypto era))
  , pProcGovernanceAction :: !(GovernanceAction era)
- , pProcAnchor :: !(StrictMaybe (Anchor (EraCrypto era)))
+ , pProcAnchor :: !(Anchor (EraCrypto era))
  }
  deriving (Generic, Eq, Show)
 
@@ -285,7 +285,7 @@ instance EraPParams era => DecCBOR (ProposalProcedure era) where
  <! From
  <! From
  <! From
- <! D (decodeNullStrictMaybe decCBOR)
+ <! From
 
 instance EraPParams era => EncCBOR (ProposalProcedure era) where
  encCBOR ProposalProcedure {..} =
@@ -294,7 +294,7 @@ instance EraPParams era => EncCBOR (ProposalProcedure era) where
  !> To pProcDeposit
  !> To pProcReturnAddr
  !> To pProcGovernanceAction
- !> E (encodeNullStrictMaybe encCBOR) pProcAnchor
+ !> To pProcAnchor
 
 data GovernanceAction era
  = ParameterChange !(PParamsUpdate era)

diff --git a/eras/conway/test-suite/cddl-files/conway.cddl b/eras/conway/test-suite/cddl-files/conway.cddl
@@ -75,14 +75,14 @@ voting_procedure =
  [ governance_action_id
  , voter
  , vote
- , anchor / null
+ , anchor
  ]
 
 proposal_procedure =
  [ deposit : coin
  , $hash28
  , governance_action
- , anchor / null
+ , anchor
  ]
 
 governance_action =