Remove transitive dependencies to cardano-ledger-api

IntersectMBO · Oct 18, 2024 · c352284 · c352284
1 parent ab96e16
commit c352284
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/cabal.project b/cabal.project
@@ -13,9 +13,9 @@ repository cardano-haskell-packages
 source-repository-package
   type: git
   location: https://github.com/intersectmbo/cardano-api.git
-  tag: 13a468f2d9f0939cf795815683cc1bf65412ee35
+  tag: e584cc2a021f476ac60cac956164521fb88e55a7
   subdir: cardano-api
-  --sha256: sha256-SQleaCv+MtUJXQfAMS4Ol71yDT8O/CPYNClUT6s5gxQ=
+  --sha256: sha256-kSugQ7yTiXW8muQCSrV2bffyaaXXNHfNFgEYrmoSd3g=
 
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -203,7 +203,6 @@ library
     cardano-crypto-wrapper ^>=1.5.1,
     cardano-data >=1.1,
     cardano-git-rev ^>=0.2.2,
-    cardano-ledger-api,
     cardano-ping ^>=0.5,
     cardano-prelude,
     cardano-slotting ^>=0.2.0.0,

diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
@@ -179,7 +179,7 @@ txSpendUTxOByronPBFT nId sk txIns outs = do
        in makeSignedByronTransaction [bWit] txBody
 
 fromByronWitness
-  :: Byron.SomeByronSigningKey -> NetworkId -> L.Annotated L.Tx ByteString -> KeyWitness ByronEra
+  :: Byron.SomeByronSigningKey -> NetworkId -> L.Annotated Byron.Tx ByteString -> KeyWitness ByronEra
 fromByronWitness bw nId txBody =
   case bw of
     Byron.AByronSigningKeyLegacy sk -> makeByronKeyWitness nId txBody sk

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -51,7 +51,6 @@ import           Cardano.CLI.Types.Errors.TxCmdError
 import           Cardano.CLI.Types.Errors.TxValidationError
 import           Cardano.CLI.Types.Output (renderScriptCosts)
 import           Cardano.CLI.Types.TxFeature
-import qualified Cardano.Ledger.Api.PParams as L
 import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus
 import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx
 

diff --git a/cardano-cli/src/Cardano/CLI/Helpers.hs b/cardano-cli/src/Cardano/CLI/Helpers.hs
@@ -126,7 +126,7 @@ validateCBOR cborObject bs =
       void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Certificate)
       Right "Valid Byron delegation certificate."
     CBORTxByron -> do
-      void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s L.Tx)
+      void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Tx)
       Right "Valid Byron Tx."
     CBORUpdateProposalByron -> do
       void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Proposal)

diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs
@@ -42,8 +42,9 @@ where
 
 import           Cardano.Api as Api
 import           Cardano.Api.Byron (KeyWitness (ByronKeyWitness))
-import           Cardano.Api.Ledger (ExUnits (..), extractHash, strictMaybeToMaybe, unData)
+import           Cardano.Api.Ledger (ExUnits (..), extractHash, strictMaybeToMaybe)
 import qualified Cardano.Api.Ledger as L
+import qualified Cardano.Api.Ledger as Ledger
 import           Cardano.Api.Shelley (Hash (..),
                    KeyWitness (ShelleyBootstrapWitness, ShelleyKeyWitness), Proposal (..),
                    ShelleyLedgerEra, StakeAddress (..), Tx (ShelleyTx),
@@ -54,9 +55,6 @@ import           Cardano.CLI.Orphans ()
 import           Cardano.CLI.Types.Common (ViewOutputFormat (..))
 import           Cardano.CLI.Types.MonadWarning (MonadWarning, runWarningIO)
 import           Cardano.Crypto.Hash (hashToTextAsHex)
-import qualified Cardano.Ledger.Api as Ledger
-import           Cardano.Ledger.Api.Tx.In (txIxToInt)
-import qualified Cardano.Ledger.Api.Tx.In as Ledger
 
 import           Data.Aeson (Value (..), object, toJSON, (.=))
 import qualified Data.Aeson as Aeson
@@ -357,7 +355,7 @@ getRedeemerDetails aeo tb =
   friendlyRedeemer :: Ledger.Data (ShelleyLedgerEra era) -> ExUnits -> Aeson.Value
   friendlyRedeemer scriptData ExUnits{exUnitsSteps = exSteps, exUnitsMem = exMemUnits} =
     object
-      [ "data" .= Aeson.String (T.pack $ show $ unData scriptData)
+      [ "data" .= Aeson.String (T.pack $ show $ Ledger.unData scriptData)
       , "execution units"
           .= object
             [ "steps" .= Aeson.Number (fromIntegral exSteps)
@@ -392,7 +390,7 @@ getRedeemerDetails aeo tb =
   friendlyInput (Ledger.TxIn (Ledger.TxId txidHash) ix) =
     Aeson.String $
       T.pack $
-        T.unpack (hashToTextAsHex (extractHash txidHash)) ++ "#" ++ show (txIxToInt ix)
+        T.unpack (hashToTextAsHex (extractHash txidHash)) ++ "#" ++ show (Ledger.txIxToInt ix)
 
   addLabelToPurpose :: ToJSON v => EraIndependentPlutusScriptPurpose -> v -> Aeson.Value
   addLabelToPurpose Spending sp = Aeson.object ["spending script witnessed input" .= sp]

diff --git a/cardano-cli/src/Cardano/CLI/Orphans.hs b/cardano-cli/src/Cardano/CLI/Orphans.hs
@@ -9,8 +9,6 @@ import           Cardano.Api
 import qualified Cardano.Api.Ledger as L
 import           Cardano.Api.Shelley (scriptDataToJsonDetailedSchema)
 
-import qualified Cardano.Ledger.Api as L
-
 import           Data.Aeson
 
 -- TODO upstream this orphaned instance to the ledger