Merge pull request #4747 from IntersectMBO/jj/baseaddr-translation

Fixed translation of `StakeReference`
IntersectMBO · Nov 14, 2024 · 242cdd5 · 242cdd5
2 parents 0b863a6 + faacc9f
commit 242cdd5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cabal.project b/cabal.project
@@ -24,8 +24,8 @@ source-repository-package
   -- !WARNING!:
   -- MAKE SURE THIS POINTS TO A COMMIT IN `MAlonzo-code` BEFORE MERGE!
   subdir: generated
-  tag: 4c38bca875fc6ad1faf12a94508ac1645722a663
-  --sha256: sha256-0+2u8pG947XDLRFaT87DGHRlilGf94av0dg7a6MnfAM=
+  tag: 511c5632eff71f4811b48fba71e7aaadfd69211a
+  --sha256: sha256-J6Sbrr9Klz3N72wT2ZF02z5G6iFHjpwfUH2pFVoJr3c=
 -- NOTE: If you would like to update the above, look for the `MAlonzo-code`
 -- branch in the `formal-ledger-specifications` repo and copy the SHA of
 -- the commit you need. The `MAlonzo-code` branch functions like an alternative

diff --git a/eras/shelley/impl/CHANGELOG.md b/eras/shelley/impl/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.15.0.0
 
+* Added `Generic`, `Eq`, `Show`, `NFData`, `EncCBOR` instances for `ShelleyLedgersEnv`
 * Remove deprecated `witsVKeyNeededGov`, `witsVKeyNeededNoGov`, `shelleyWitsVKeyNeeded` and `propWits`
 * Remove deprecated `PPUPPredFailure`, `delPlAcnt`, `prAcnt`, `votedValue`
 * Remove impossible predicate failure `StakeKeyInRewardsDELEG`
@@ -34,6 +35,7 @@
 
 ### `testlib`
 
+* Added `ToExpr` instance for `ShelleyLedgersEnv`
 * Changed type signature of `freshKeyHashVRF` to return `VRFVerKeyHash` instead of just a `Hash`
 * Added `expectUTxOContent`
 * Added `disableTreasuryExpansion`

diff --git a/...rdano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/SpecTranslate/Conway/Base.hs b/...rdano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/SpecTranslate/Conway/Base.hs
@@ -151,11 +151,11 @@ instance SpecTranslate ctx (TxIn era) where
   toSpecRep (TxIn txId txIx) = toSpecRep (txId, txIx)
 
 instance SpecTranslate ctx (StakeReference era) where
-  type SpecRep (StakeReference era) = Agda.Credential
+  type SpecRep (StakeReference era) = Maybe Agda.Credential
 
-  toSpecRep (StakeRefBase c) = toSpecRep c
-  toSpecRep (StakeRefPtr _) = error "Cannot translate StakeRefPtr"
-  toSpecRep StakeRefNull = error "Cannot translate StakeRefNull"
+  toSpecRep (StakeRefBase c) = Just <$> toSpecRep c
+  toSpecRep (StakeRefPtr _) = pure Nothing
+  toSpecRep StakeRefNull = pure Nothing
 
 instance SpecTranslate ctx (BootstrapAddress era) where
   type SpecRep (BootstrapAddress era) = Agda.BootstrapAddr