Merge pull request #1319 from IntersectMBO/geo2a/10.7-integration

10.7 integration

Author: Jimbo4350

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2026-02-06T20:27:32Z
-  , cardano-haskell-packages 2026-02-27T19:25:49Z
+  , hackage.haskell.org 2026-02-17T10:15:41Z
+  , cardano-haskell-packages 2026-03-19T11:07:17Z
 
 packages:
   cardano-cli

cardano-cli/cardano-cli.cabal

@@ -242,18 +242,18 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=10.24,
+    cardano-api ^>=10.25,
     cardano-binary,
     cardano-crypto,
-    cardano-crypto-class ^>=2.2.3.2,
-    cardano-crypto-wrapper ^>=1.6,
+    cardano-crypto-class ^>=2.3,
+    cardano-crypto-wrapper ^>=1.7,
     cardano-data >=1.1,
     cardano-git-rev ^>=0.2.2,
     cardano-ledger-api,
     cardano-ledger-conway,
     cardano-ledger-core,
     cardano-ledger-dijkstra,
-    cardano-ping ^>=0.9,
+    cardano-ping ^>=0.10,
     cardano-prelude,
     cardano-protocol-tpraos,
     cardano-slotting ^>=0.2.0.0,
@@ -282,8 +282,7 @@ library
     network-uri,
     optparse-applicative-fork,
     ordered-containers,
-    ouroboros-consensus,
-    ouroboros-consensus-cardano,
+    ouroboros-consensus:{cardano, ouroboros-consensus},
     prettyprinter,
     prettyprinter-ansi-terminal,
     random,
@@ -443,10 +442,8 @@ test-suite cardano-cli-golden
     cardano-cli,
     cardano-cli:cardano-cli-test-lib,
     cardano-crypto-wrapper,
-    cardano-ledger-core,
     cardano-strict-containers ^>=0.1,
     cborg,
-    containers,
     directory,
     exceptions,
     extra,

cardano-cli/src/Cardano/CLI/Byron/Tx.hs

@@ -26,7 +26,6 @@ import Cardano.Api
 import Cardano.Api.Byron qualified as Byron
 import Cardano.Api.Consensus qualified as Byron
 import Cardano.Api.Ledger qualified as L
-import Cardano.Api.Network qualified as Net.Tx
 
 import Cardano.Binary qualified as Binary
 import Cardano.CLI.Byron.Key (byronWitnessToVerKey)
@@ -199,11 +198,12 @@ nodeSubmitTx nodeSocketPath network gentx = do
           }
   res <- liftIO $ submitTxToNodeLocal connctInfo (TxInByronSpecial gentx)
   case res of
-    Net.Tx.SubmitSuccess -> liftIO $ Text.putStrLn "Transaction successfully submitted."
-    Net.Tx.SubmitFail reason ->
+    TxSubmitSuccess -> liftIO $ Text.putStrLn "Transaction successfully submitted."
+    TxSubmitFail reason ->
       case reason of
         TxValidationErrorInCardanoMode err -> left . ByronTxSubmitError . Text.pack $ show err
         TxValidationEraMismatch mismatchErr -> left $ ByronTxSubmitErrorEraMismatch mismatchErr
+    TxSubmitError err -> left . ByronTxSubmitError . Text.pack $ show err
 
   return ()
 

cardano-cli/src/Cardano/CLI/Compatible/Json/Friendly.hs

@@ -284,7 +284,7 @@ getScriptWitnessDetails era tb =
  where
   aeo = convert era
   friendlyRedeemers
-    :: Ledger.Tx (ShelleyLedgerEra era)
+    :: Ledger.Tx C.TopTx (ShelleyLedgerEra era)
     -> Aeson.Value
   friendlyRedeemers tx =
     alonzoEraOnwardsConstraints aeo $ do
@@ -293,7 +293,7 @@ getScriptWitnessDetails era tb =
       Aeson.Array $ Vector.fromList redeemerList
 
   friendlyRedeemerInfo
-    :: Ledger.Tx (ShelleyLedgerEra era)
+    :: Ledger.Tx C.TopTx (ShelleyLedgerEra era)
     -> Ledger.PlutusPurpose Ledger.AsIx (ShelleyLedgerEra era)
     -> (Ledger.Data (ShelleyLedgerEra era), ExUnits)
     -> Aeson.Value
@@ -373,7 +373,7 @@ getScriptWitnessDetails era tb =
   addLabelToPurpose Proposing pp = Aeson.object ["submitting a proposal following proposal policy" .= pp]
   addLabelToPurpose Guarding _ = error "TODO Dijkstra"
 
-  friendlyScriptData :: Ledger.Tx (ShelleyLedgerEra era) -> Aeson.Value
+  friendlyScriptData :: Ledger.Tx C.TopTx (ShelleyLedgerEra era) -> Aeson.Value
   friendlyScriptData tx =
     alonzoEraOnwardsConstraints aeo $ do
       Aeson.Array $
@@ -386,7 +386,7 @@ getScriptWitnessDetails era tb =
           | (scriptHash, scriptData) <- Map.toList $ tx ^. Ledger.witsTxL . Ledger.scriptTxWitsL
           ]
 
-  friendlyDats :: Ledger.Tx (ShelleyLedgerEra era) -> Aeson.Value
+  friendlyDats :: Ledger.Tx C.TopTx (ShelleyLedgerEra era) -> Aeson.Value
   friendlyDats tx =
     alonzoEraOnwardsConstraints aeo $
       let Ledger.TxDats dats = tx ^. Ledger.witsTxL . Ledger.datsTxWitsL
@@ -633,7 +633,7 @@ renderCertificate sbe (Exp.Certificate c) =
 
 renderDrepCredential
   :: ()
-  => L.Credential 'L.DRepRole
+  => L.Credential L.DRepRole
   -> Aeson.Value
 renderDrepCredential =
   object . \case

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

@@ -18,7 +18,7 @@ import Cardano.Api.Compatible.Certificate qualified as Compatible
 import Cardano.Api.Experimental (obtainCommonConstraints)
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 import Cardano.Api.Experimental.Tx qualified as Exp
 import Cardano.Api.Ledger qualified as L hiding
   ( VotingProcedures
@@ -158,9 +158,9 @@ readCertificateScriptWitnessSbe
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
     ) = do
     let plutusScriptFp = unFile scriptFp
-    Exp.AnyPlutusScript anyPlutusScript <- Compatible.readFilePlutusScript sbe plutusScriptFp
+    Exp.Plutus.AnyPlutusScript anyPlutusScript <- Compatible.readFilePlutusScript sbe plutusScriptFp
     let
-      lang = Exp.plutusScriptInEraSLanguage anyPlutusScript
+      lang = Exp.Plutus.plutusScriptInEraSLanguage anyPlutusScript
     let script' = Exp.PScript anyPlutusScript
 
     redeemer <-

cardano-cli/src/Cardano/CLI/Compatible/Transaction/ScriptWitness.hs

@@ -21,7 +21,7 @@ import Cardano.Api
   )
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.Compatible.Read (readFilePlutusScript, readFileSimpleScript)
@@ -68,8 +68,8 @@ readCertificateScriptWitness sbe certScriptReq =
     OnDiskPlutusScript
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
         let plutusScriptFp = unFile scriptFp
-        Exp.AnyPlutusScript anyPlutusScript <- readFilePlutusScript sbe plutusScriptFp
-        let lang = Exp.plutusScriptInEraSLanguage anyPlutusScript
+        Exp.Plutus.AnyPlutusScript anyPlutusScript <- readFilePlutusScript sbe plutusScriptFp
+        let lang = Exp.Plutus.plutusScriptInEraSLanguage anyPlutusScript
             script' = Exp.PScript anyPlutusScript
         redeemer <-
           fromExceptTCli $

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

@@ -374,6 +374,13 @@ parseLovelace = do
     then fail $ show i <> " lovelace exceeds the Word64 upper bound"
     else return $ L.Coin i
 
+parseCoinPerByte :: P.Parser L.CoinPerByte
+parseCoinPerByte = do
+  i <- P.parseDecimal
+  case L.toCompact (Coin i) of
+    Nothing -> fail $ show i <> " lovelace exceeds the Word64 upper bound"
+    Just c -> pure . L.CoinPerByte $ c
+
 -- | The first argument is the optional prefix.
 pStakePoolVerificationKeyOrFile
   :: Maybe String
@@ -2712,9 +2719,9 @@ pCostModels =
       , Opt.completer (Opt.bashCompleter "file")
       ]
 
-pMinFeePerByteFactor :: Parser Lovelace
+pMinFeePerByteFactor :: Parser L.CoinPerByte
 pMinFeePerByteFactor =
-  Opt.option (readerFromParsecParser parseLovelace) $
+  Opt.option (readerFromParsecParser parseCoinPerByte) $
     mconcat
       [ Opt.long "min-fee-linear"
       , Opt.metavar "LOVELACE"
@@ -2935,9 +2942,9 @@ pExtraEntropy =
       . BSC.pack
       =<< some P.hexDigit
 
-pUTxOCostPerByte :: Parser Lovelace
+pUTxOCostPerByte :: Parser L.CoinPerByte
 pUTxOCostPerByte =
-  Opt.option (readerFromParsecParser parseLovelace) $
+  Opt.option (readerFromParsecParser parseCoinPerByte) $
     mconcat
       [ Opt.long "utxo-cost-per-byte"
       , Opt.metavar "LOVELACE"
@@ -3004,7 +3011,7 @@ pMaxBlockExecutionUnits =
           ]
       )
 
-pMaxValueSize :: Parser Natural
+pMaxValueSize :: Parser Word32
 pMaxValueSize =
   Opt.option integralReader $
     mconcat
@@ -3016,7 +3023,7 @@ pMaxValueSize =
             ]
       ]
 
-pCollateralPercent :: Parser Natural
+pCollateralPercent :: Parser Word16
 pCollateralPercent =
   Opt.option integralReader $
     mconcat
@@ -3030,7 +3037,7 @@ pCollateralPercent =
             ]
       ]
 
-pMaxCollateralInputs :: Parser Natural
+pMaxCollateralInputs :: Parser Word16
 pMaxCollateralInputs =
   Opt.option integralReader $
     mconcat
@@ -3208,7 +3215,7 @@ pDRepVotingThresholds =
         , Opt.help "Acceptance threshold for DRep votes on treasury withdrawals."
         ]
 
-pMinCommitteeSize :: Parser Natural
+pMinCommitteeSize :: Parser Word16
 pMinCommitteeSize =
   Opt.option integralReader $
     mconcat

cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs

@@ -382,8 +382,8 @@ runGenesisCreateTestNetDataCmd
       addDRepsToConwayGenesis dRepKeys (map snd delegatorKeys) conwayGenesis
         <&> addCommitteeToConwayGenesis ccColdKeys
 
-    let stake = second L.ppId . mkDelegationMapEntry <$> delegations
-        stakePools = [(L.ppId poolParams', poolParams') | poolParams' <- snd . mkDelegationMapEntry <$> delegations]
+    let stake = second L.sppId . mkDelegationMapEntry <$> delegations
+        stakePools = [(L.sppId poolParams', poolParams') | poolParams' <- snd . mkDelegationMapEntry <$> delegations]
         delegAddrs = dInitialUtxoAddr <$> delegations
     !shelleyGenesis' <-
       fromExceptTCli $
@@ -447,7 +447,7 @@ runGenesisCreateTestNetDataCmd
     mkPoolDir idx = poolsDir </> ("pool" <> show idx)
 
     mkDelegationMapEntry
-      :: Delegation -> (L.KeyHash L.Staking, L.PoolParams)
+      :: Delegation -> (L.KeyHash L.Staking, L.StakePoolParams)
     mkDelegationMapEntry d = (dDelegStaking d, dPoolParams d)
 
     addCommitteeToConwayGenesis
@@ -751,7 +751,7 @@ createPoolCredentials fmt dir = do
 data Delegation = Delegation
   { dInitialUtxoAddr :: !(AddressInEra ShelleyEra)
   , dDelegStaking :: !(L.KeyHash L.Staking)
-  , dPoolParams :: !L.PoolParams
+  , dPoolParams :: !L.StakePoolParams
   }
   deriving (Generic, NFData)
 
@@ -763,7 +763,7 @@ buildPoolParams
   -- ^ The index of the pool being built. Starts at 0.
   -> Map Word [L.StakePoolRelay]
   -- ^ User submitted stake pool relay map. Starts at 0
-  -> ExceptT GenesisCmdError IO L.PoolParams
+  -> ExceptT GenesisCmdError IO L.StakePoolParams
 buildPoolParams nw dir index specifiedRelays = do
   StakePoolVerificationKey poolColdVK <-
     firstExceptT (GenesisCmdStakePoolCmdError . StakePoolCmdReadFileError)
@@ -780,17 +780,17 @@ buildPoolParams nw dir index specifiedRelays = do
       $ readFileTextEnvelope poolRewardVKF
 
   pure
-    L.PoolParams
-      { L.ppId = L.hashKey poolColdVK
-      , L.ppVrf = C.hashVerKeyVRF @StandardCrypto poolVrfVK
-      , L.ppPledge = L.Coin 0
-      , L.ppCost = L.Coin 0
-      , L.ppMargin = minBound
-      , L.ppRewardAccount =
+    L.StakePoolParams
+      { L.sppId = L.hashKey poolColdVK
+      , L.sppVrf = C.hashVerKeyVRF @StandardCrypto poolVrfVK
+      , L.sppPledge = L.Coin 0
+      , L.sppCost = L.Coin 0
+      , L.sppMargin = minBound
+      , L.sppAccountAddress =
           toShelleyStakeAddr $ makeStakeAddress nw $ StakeCredentialByKey (verificationKeyHash rewardsSVK)
-      , L.ppOwners = mempty
-      , L.ppRelays = lookupPoolRelay specifiedRelays
-      , L.ppMetadata = L.SNothing
+      , L.sppOwners = mempty
+      , L.sppRelays = lookupPoolRelay specifiedRelays
+      , L.sppMetadata = L.SNothing
       }
  where
   lookupPoolRelay :: Map Word [L.StakePoolRelay] -> Seq.StrictSeq L.StakePoolRelay
@@ -812,7 +812,7 @@ computeInsecureStakeKeyAddr g0 = do
 computeDelegation
   :: NetworkId
   -> (VerificationKey PaymentKey, VerificationKey StakeKey)
-  -> L.PoolParams
+  -> L.StakePoolParams
   -> Delegation
 computeDelegation nw (paymentVK, stakeVK) dPoolParams = do
   let paymentCredential = PaymentCredentialByKey (verificationKeyHash paymentVK)
@@ -835,9 +835,9 @@ updateOutputTemplate
   -- ^ Total amount of lovelace
   -> [AddressInEra ShelleyEra]
   -- ^ UTxO addresses that are not delegating
-  -> [(L.KeyHash 'L.StakePool, L.PoolParams)]
+  -> [(L.KeyHash L.StakePool, L.StakePoolParams)]
   -- ^ Pool map
-  -> [(L.KeyHash 'L.Staking, L.KeyHash 'L.StakePool)]
+  -> [(L.KeyHash L.Staking, L.KeyHash L.StakePool)]
   -- ^ Delegaton map
   -> Maybe Lovelace
   -- ^ Amount of lovelace to delegate