Rebase and fixup

Author: aniketd

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2025-03-18T07:42:38Z
-  , cardano-haskell-packages 2025-03-19T18:08:29Z
+  , cardano-haskell-packages 2025-03-25T16:05:50Z
 
 
 packages:
@@ -77,76 +77,18 @@ if impl (ghc >= 9.12)
     -- https://github.com/fizruk/http-api-data/pull/146
     , http-api-data:base
 
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: b2cec3fbcde4bacb9c961e5510d5a1d3754c4e2b
-  --sha256: sha256-TDEBINZ3SkhpRNomMdt53bR3gdzgkWR9jIlAr8yrU6o=
-  subdir:
-      cardano-crypto-class
-      cardano-slotting
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/plutus
-  tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168
-  --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M=
-  subdir:
-    plutus-core
-    plutus-ledger-api
-    plutus-tx
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger
-  tag: f5b35692b4d92d664187781a98b7af3fab445bad
-  --sha256: sha256-krYzn7ct6S52bGLC8vs5/pL421UbP0+jVjxwUhOcbcA=
-  subdir:
-      eras/allegra/impl
-      eras/alonzo/impl
-      eras/alonzo/test-suite
-      eras/babbage/impl
-      eras/babbage/test-suite
-      eras/byron/chain/executable-spec
-      eras/byron/crypto
-      eras/byron/crypto/test
-      eras/byron/ledger/executable-spec
-      eras/byron/ledger/impl
-      eras/byron/ledger/impl/test
-      eras/conway/impl
-      eras/conway/test-suite
-      eras/mary/impl
-      eras/shelley/impl
-      eras/shelley-ma/test-suite
-      eras/shelley/test-suite
-      libs/cardano-data
-      libs/cardano-ledger-api
-      libs/cardano-ledger-binary
-      libs/cardano-ledger-core
-      libs/cardano-ledger-test
-      libs/cardano-protocol-tpraos
-      libs/constrained-generators
-      libs/non-integral
-      libs/set-algebra
-      libs/small-steps
-      libs/vector-map
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/ouroboros-consensus
-  tag: 1e2c0fed8e81c15575bf3cd3aaa9b6efde328d8d
-  --sha256: sha256-osyNYXxJqg4MS6ISXtEneuYRb0xBIr5ztGmxvMyGTL4=
-  subdir:
-    ouroboros-consensus
-    ouroboros-consensus-cardano
-    ouroboros-consensus-protocol
-    ouroboros-consensus-diffusion
+    -- https://github.com/IntersectMBO/ouroboros-consensus/blob/main/cabal.project#L70-L74
+    , ouroboros-network-protocols:base
+    , ouroboros-network-framework:base
+    , ouroboros-network-api:base
+    , network-mux:base
+    , ouroboros-network:base
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-api
-  tag: de211cac855cf7e9e1bcd668a86bc121057efcc1
-  --sha256: sha256-PX/NITXB65xIIS1enOeHbVZCq0CAksVM1kq24Uco1pg=
+  tag: 8763425e418d5df0445d2b4afda5cecd284141f1
+  --sha256: sha256-BCHAGx3S6VtgoF+oREllJHtD+ZQwLh4LxTM/tkINPSg=
   subdir:
     cardano-api
     cardano-api-gen

cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs

@@ -13,7 +13,6 @@
 module Cardano.CLI.EraBased.Common.Option where
 
 import Cardano.Api
-import Cardano.Api.Ledger (StandardCrypto)
 import Cardano.Api.Ledger qualified as L
 import Cardano.Api.Network qualified as Consensus
 import Cardano.Api.Shelley
@@ -2210,7 +2209,7 @@ pRefScriptFp =
 pMintMultiAsset
   :: ShelleyBasedEra era
   -> BalanceTxExecUnits
-  -> Parser (Maybe (L.MultiAsset StandardCrypto, [CliMintScriptRequirements]))
+  -> Parser (Maybe (L.MultiAsset, [CliMintScriptRequirements]))
 pMintMultiAsset w balanceExecUnits =
   caseShelleyToAllegraOrMaryEraOnwards
     (const $ pure Nothing)

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Command.hs

@@ -71,7 +71,7 @@ data TransactionBuildRawCmdArgs era = TransactionBuildRawCmdArgs
   , requiredSigners :: ![RequiredSigner]
   -- ^ Required signers
   , txouts :: ![TxOutAnyEra]
-  , mMintedAssets :: !(Maybe (L.MultiAsset L.StandardCrypto, [CliMintScriptRequirements]))
+  , mMintedAssets :: !(Maybe (L.MultiAsset, [CliMintScriptRequirements]))
   -- ^ Multi-Asset minted value with script witness
   , mValidityLowerBound :: !(Maybe SlotNo)
   -- ^ Transaction validity lower bound
@@ -119,7 +119,7 @@ data TransactionBuildCmdArgs era = TransactionBuildCmdArgs
   -- ^ Normal outputs
   , changeAddresses :: !TxOutChangeAddress
   -- ^ A change output
-  , mMintedAssets :: !(Maybe (L.MultiAsset L.StandardCrypto, [CliMintScriptRequirements]))
+  , mMintedAssets :: !(Maybe (L.MultiAsset, [CliMintScriptRequirements]))
   -- ^ Multi-Asset minted value with script witness
   , mValidityLowerBound :: !(Maybe SlotNo)
   -- ^ Transaction validity lower bound
@@ -165,7 +165,7 @@ data TransactionBuildEstimateCmdArgs era = TransactionBuildEstimateCmdArgs
   -- ^ Normal outputs
   , changeAddress :: !TxOutChangeAddress
   -- ^ A change output
-  , mMintedAssets :: !(Maybe (L.MultiAsset L.StandardCrypto, [CliMintScriptRequirements]))
+  , mMintedAssets :: !(Maybe (L.MultiAsset, [CliMintScriptRequirements]))
   -- ^ Multi-Asset value with script witness
   , mValidityLowerBound :: !(Maybe SlotNo)
   -- ^ Transaction validity lower bound

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

@@ -782,7 +782,7 @@ runTxBuildRaw
   -- ^ Tx upper bound
   -> Lovelace
   -- ^ Tx fee
-  -> (L.MultiAsset L.StandardCrypto, [MintScriptWitnessWithPolicyId era])
+  -> (L.MultiAsset, [MintScriptWitnessWithPolicyId era])
   -- ^ Multi-Asset minted value(s)
   -> [(Certificate era, Maybe (ScriptWitness WitCtxStake era))]
   -- ^ Certificate with potential script witness
@@ -868,7 +868,7 @@ constructTxBodyContent
   -- ^ Tx lower bound
   -> TxValidityUpperBound era
   -- ^ Tx upper bound
-  -> (L.MultiAsset L.StandardCrypto, [MintScriptWitnessWithPolicyId era])
+  -> (L.MultiAsset, [MintScriptWitnessWithPolicyId era])
   -- ^ Multi-Asset value(s)
   -> [(Certificate era, Maybe (ScriptWitness WitCtxStake era))]
   -- ^ Certificate with potential script witness
@@ -1011,7 +1011,7 @@ runTxBuild
   -- ^ Normal outputs
   -> TxOutChangeAddress
   -- ^ A change output
-  -> (L.MultiAsset L.StandardCrypto, [MintScriptWitnessWithPolicyId era])
+  -> (L.MultiAsset, [MintScriptWitnessWithPolicyId era])
   -- ^ Multi-Asset value(s)
   -> Maybe SlotNo
   -- ^ Tx lower bound
@@ -1384,7 +1384,7 @@ toTxAlonzoDatum supp cliDatum =
 createTxMintValue
   :: forall era
    . ShelleyBasedEra era
-  -> (L.MultiAsset L.StandardCrypto, [MintScriptWitnessWithPolicyId era])
+  -> (L.MultiAsset, [MintScriptWitnessWithPolicyId era])
   -> Either TxCmdError (TxMintValue BuildTx era)
 createTxMintValue era (val, scriptWitnesses) =
   if mempty == val && List.null scriptWitnesses

cardano-cli/src/Cardano/CLI/Orphan.hs

@@ -13,6 +13,7 @@ import Cardano.Api.Ledger qualified as L
 import Cardano.Api.Shelley (VotesMergingConflict, scriptDataToJsonDetailedSchema)
 
 import Cardano.Ledger.CertState qualified as L
+import Cardano.Ledger.State qualified as L
 
 import Data.Aeson
 
@@ -21,7 +22,7 @@ instance Error (VotesMergingConflict era) where
 
 -- TODO upstream this orphaned instance to the ledger
 instance
-  (L.EraTxOut ledgerera, L.EraGov ledgerera, L.EraCertState ledgerera)
+  (L.EraTxOut ledgerera, L.EraGov ledgerera, L.EraCertState ledgerera, L.EraStake ledgerera)
   => ToJSON (L.NewEpochState ledgerera)
   where
   toJSON (L.NewEpochState nesEL nesBprev nesBCur nesEs nesRu nesPd _stashedAvvm) =