Add public module Cardano.Write.Eras

lib/api/src/Cardano/Wallet/Api/Http/Server/Error.hs

@@ -214,6 +214,9 @@ import qualified Cardano.Wallet.Api.Types.WalletAssets as ApiWalletAssets
 import qualified Cardano.Wallet.Primitive.Types.TokenBundle as TokenBundle
 import qualified Cardano.Wallet.Primitive.Types.TokenMap as TokenMap
 import qualified Cardano.Wallet.Primitive.Types.UTxO as UTxO
+import qualified Cardano.Write.Eras as Write
+    ( IsRecentEra
+    )
 import qualified Data.Aeson as Aeson
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BL
@@ -222,8 +225,7 @@ import qualified Data.List as L
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import qualified Internal.Cardano.Write.Tx as Write
-    ( IsRecentEra
-    , serializeTx
+    ( serializeTx
     )
 import qualified Internal.Cardano.Write.Tx as WriteTx
 import qualified Internal.Cardano.Write.Tx.Balance as Write

lib/api/src/Cardano/Wallet/Api/Http/Server/Error/AssignReedemers.hs

@@ -17,12 +17,12 @@ import Cardano.Wallet.Api.Http.Server.Error.IsServerError
 import Cardano.Wallet.Api.Types.Error
     ( ApiErrorInfo (..)
     )
+import Cardano.Write.Eras
+    ( IsRecentEra (..)
+    )
 import Fmt
     ( pretty
     )
-import Internal.Cardano.Write.Tx
-    ( IsRecentEra (..)
-    )
 import Internal.Cardano.Write.Tx.Balance
     ( ErrAssignRedeemers (..)
     )

lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs

@@ -668,6 +668,9 @@ import Cardano.Wallet.Transaction
 import Cardano.Wallet.Unsafe
     ( unsafeRunExceptT
     )
+import Cardano.Write.Eras
+    ( AnyRecentEra (..)
+    )
 import Control.Arrow
     ( second
     , (&&&)
@@ -799,9 +802,6 @@ import Fmt
 import GHC.Generics
     ( Generic
     )
-import Internal.Cardano.Write.Tx
-    ( AnyRecentEra (..)
-    )
 import Internal.Cardano.Write.Tx.Balance
     ( PartialTx (..)
     , Redeemer (..)
@@ -882,6 +882,12 @@ import qualified Cardano.Wallet.Primitive.Types.UTxO as UTxO
 import qualified Cardano.Wallet.Read as Read
 import qualified Cardano.Wallet.Read.Hash as Hash
 import qualified Cardano.Wallet.Registry as Registry
+import qualified Cardano.Write.Eras as Write
+    ( IsRecentEra
+    , RecentEra
+    , cardanoEra
+    , cardanoEraFromRecentEra
+    )
 import qualified Control.Concurrent.Concierge as Concierge
 import qualified Data.ByteArray as BA
 import qualified Data.ByteString as BS
@@ -893,14 +899,10 @@ import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Internal.Cardano.Write.Tx as Write
     ( Datum (DatumHash, NoDatum)
-    , IsRecentEra
     , PParamsInAnyRecentEra (PParamsInAnyRecentEra)
-    , RecentEra
     , Tx
     , TxIn
     , TxOutInRecentEra (TxOutInRecentEra)
-    , cardanoEra
-    , cardanoEraFromRecentEra
     , fromCardanoApiTx
     , getFeePerByte
     , pattern PolicyId

lib/api/src/Cardano/Wallet/Api/Types/Era.hs

@@ -69,12 +69,12 @@ import Text.Show
     )
 
 import qualified Cardano.Wallet.Read as Read
-import qualified Data.Aeson as Aeson
-import qualified Data.Set as Set
-import qualified Internal.Cardano.Write.Tx as Write
+import qualified Cardano.Write.Eras as Write
     ( allRecentEras
     , toAnyCardanoEra
     )
+import qualified Data.Aeson as Aeson
+import qualified Data.Set as Set
 
 data ApiEra
     = ApiByron

lib/balance-tx/cardano-balance-tx.cabal

@@ -40,6 +40,7 @@ library
   build-depends:
     , cardano-balance-tx:internal
   exposed-modules:
+    Cardano.Write.Eras
     Cardano.Write.Tx
 
 library internal

lib/balance-tx/lib/main/Cardano/Write/Eras.hs

@@ -0,0 +1,55 @@
+-- |
+-- Copyright: © 2024 Cardano Foundation
+-- License: Apache-2.0
+--
+module Cardano.Write.Eras
+    (
+    -- * Eras
+      BabbageEra
+    , ConwayEra
+
+    -- ** RecentEra
+    , RecentEra (..)
+    , IsRecentEra (..)
+    , CardanoApiEra
+    , toRecentEra
+    , fromRecentEra
+    , MaybeInRecentEra (..)
+    , LatestLedgerEra
+    , RecentEraConstraints
+    , allRecentEras
+
+    -- ** Existential wrapper
+    , AnyRecentEra (..)
+    , toAnyCardanoEra
+    , fromAnyCardanoEra
+
+    -- ** Helpers for cardano-api compatibility
+    , cardanoEra
+    , shelleyBasedEra
+    , ShelleyLedgerEra
+    , cardanoEraFromRecentEra
+    , shelleyBasedEraFromRecentEra
+    ) where
+
+import Internal.Cardano.Write.Eras
+    ( AnyRecentEra (..)
+    , BabbageEra
+    , CardanoApiEra
+    , ConwayEra
+    , IsRecentEra (..)
+    , LatestLedgerEra
+    , MaybeInRecentEra (..)
+    , RecentEra (..)
+    , RecentEraConstraints
+    , ShelleyLedgerEra
+    , allRecentEras
+    , cardanoEra
+    , cardanoEraFromRecentEra
+    , fromAnyCardanoEra
+    , fromRecentEra
+    , shelleyBasedEra
+    , shelleyBasedEraFromRecentEra
+    , toAnyCardanoEra
+    , toRecentEra
+    )

lib/benchmarks/cardano-wallet-benchmarks.cabal

@@ -108,6 +108,7 @@ benchmark restore
     , base
     , bytestring
     , cardano-addresses
+    , cardano-balance-tx
     , cardano-balance-tx:internal
     , cardano-wallet
     , cardano-wallet-api
@@ -228,6 +229,7 @@ benchmark api
     , base
     , bytestring
     , cardano-api
+    , cardano-balance-tx
     , cardano-balance-tx:internal
     , cardano-wallet
     , cardano-wallet-benchmarks

lib/benchmarks/exe/api-bench.hs

@@ -200,15 +200,15 @@ import qualified Cardano.Wallet.DB.Layer as Sqlite
 import qualified Cardano.Wallet.Primitive.Types.UTxOStatistics as UTxOStatistics
 import qualified Cardano.Wallet.Read as Read
 import qualified Cardano.Wallet.Transaction as Tx
+import qualified Cardano.Write.Eras as Write
+    ( MaybeInRecentEra (InRecentEraBabbage)
+    )
 import qualified Data.Aeson as Aeson
 import Data.Functor
     ( (<&>)
     )
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
-import qualified Internal.Cardano.Write.Tx as Write
-    ( MaybeInRecentEra (InRecentEraBabbage)
-    )
 import qualified System.Environment as Sys
 import qualified System.Exit as Sys
 

lib/network-layer/cardano-wallet-network-layer.cabal

@@ -70,6 +70,7 @@ library
     , base
     , bytestring
     , cardano-api
+    , cardano-balance-tx
     , cardano-balance-tx:internal
     , cardano-binary
     , cardano-crypto-class

lib/network-layer/src/Cardano/Wallet/Network.hs

@@ -72,6 +72,9 @@ import Cardano.Wallet.Primitive.Types.StakePoolSummary
 import Cardano.Wallet.Primitive.Types.Tx.SealedTx
     ( SealedTx
     )
+import Cardano.Write.Eras
+    ( MaybeInRecentEra
+    )
 import Control.Monad.Trans.Except
     ( ExceptT (..)
     )
@@ -96,9 +99,6 @@ import Data.Text.Class
 import GHC.Generics
     ( Generic
     )
-import Internal.Cardano.Write.Tx
-    ( MaybeInRecentEra
-    )
 
 import qualified Cardano.Wallet.Read as Read
 import qualified Data.Text as T

lib/network-layer/src/Cardano/Wallet/Network/Implementation.hs

@@ -138,6 +138,9 @@ import Cardano.Wallet.Primitive.Types.StakePoolSummary
 import Cardano.Wallet.Primitive.Types.Tx
     ( SealedTx (..)
     )
+import Cardano.Write.Eras
+    ( MaybeInRecentEra (..)
+    )
 import Control.Concurrent.Class.MonadSTM
     ( MonadSTM
     , STM
@@ -264,9 +267,6 @@ import Fmt
 import GHC.Stack
     ( HasCallStack
     )
-import Internal.Cardano.Write.Tx
-    ( MaybeInRecentEra (..)
-    )
 import Network.Mux
     ( MuxError (..)
     , MuxErrorType (..)

lib/network-layer/src/Cardano/Wallet/Network/LocalStateQuery/PParams.hs

@@ -44,7 +44,7 @@ import Cardano.Wallet.Primitive.Types.ProtocolParameters
 import Cardano.Wallet.Primitive.Types.SlottingParameters
     ( SlottingParameters
     )
-import Internal.Cardano.Write.Tx
+import Cardano.Write.Eras
     ( MaybeInRecentEra (..)
     )
 import Ouroboros.Consensus.Cardano

lib/network-layer/src/Cardano/Wallet/Network/LocalStateQuery/UTxO.hs

@@ -23,12 +23,12 @@ import Cardano.Wallet.Network.Implementation.Ouroboros
 import Cardano.Wallet.Network.LocalStateQuery.Extra
     ( onAnyEra
     )
+import Cardano.Write.Eras
+    ( MaybeInRecentEra (..)
+    )
 import Data.Set
     ( Set
     )
-import Internal.Cardano.Write.Tx
-    ( MaybeInRecentEra (..)
-    )
 import Ouroboros.Consensus.Cardano
     ( CardanoBlock
     )

lib/unit/cardano-wallet-unit.cabal

@@ -45,6 +45,7 @@ library test-common
     , base
     , bytestring
     , cardano-api
+    , cardano-balance-tx
     , cardano-balance-tx:internal
     , cardano-wallet
     , cardano-wallet-network-layer

lib/unit/test-common/Cardano/Wallet/DummyTarget/Primitive/Types.hs

@@ -91,6 +91,7 @@ import Internal.Cardano.Write.Tx.Gen
     ( mockPParams
     )
 
+import qualified Cardano.Write.Eras as Write
 import qualified Data.ByteString.Char8 as B8
 import qualified Internal.Cardano.Write.Tx as Write
 

lib/unit/test/unit/Cardano/Wallet/DelegationSpec.hs

@@ -109,9 +109,9 @@ import Test.QuickCheck.Arbitrary.Generic
 import qualified Cardano.Wallet as W
 import qualified Cardano.Wallet.Delegation as WD
 import qualified Cardano.Wallet.Primitive.Types.Coin as Coin
+import qualified Cardano.Write.Eras as Write
 import qualified Data.ByteString as BS
 import qualified Data.Set as Set
-import qualified Internal.Cardano.Write.Tx as Write
 
 spec :: Spec
 spec = describe "Cardano.Wallet.DelegationSpec" $ do

lib/unit/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs

@@ -191,6 +191,14 @@ import Cardano.Wallet.Transaction
 import Cardano.Wallet.Unsafe
     ( unsafeFromHex
     )
+import Cardano.Write.Eras
+    ( AnyRecentEra (..)
+    , CardanoApiEra
+    , IsRecentEra
+    , RecentEra (..)
+    , ShelleyLedgerEra
+    , cardanoEraFromRecentEra
+    )
 import Cardano.Write.Tx
     ( ErrBalanceTx (..)
     , ErrBalanceTxUnableToCreateChangeError (..)
@@ -267,14 +275,6 @@ import Fmt
     , (+||)
     , (||+)
     )
-import Internal.Cardano.Write.Tx
-    ( AnyRecentEra (..)
-    , CardanoApiEra
-    , IsRecentEra
-    , RecentEra (..)
-    , ShelleyLedgerEra
-    , cardanoEraFromRecentEra
-    )
 import Internal.Cardano.Write.Tx.Gen
     ( mockPParams
     )
@@ -352,6 +352,14 @@ import qualified Cardano.Wallet.Address.Derivation.Shelley as Shelley
 import qualified Cardano.Wallet.Primitive.Types.Coin as Coin
 import qualified Cardano.Wallet.Primitive.Types.TokenBundle as TokenBundle
 import qualified Cardano.Wallet.Primitive.Types.TokenMap as TokenMap
+import qualified Cardano.Write.Eras as Write
+    ( BabbageEra
+    , CardanoApiEra
+    , IsRecentEra
+    , RecentEra (RecentEraBabbage, RecentEraConway)
+    , cardanoEraFromRecentEra
+    , shelleyBasedEraFromRecentEra
+    )
 import qualified Data.ByteArray as BA
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as B8
@@ -361,14 +369,6 @@ import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
-import qualified Internal.Cardano.Write.Tx as Write
-    ( BabbageEra
-    , CardanoApiEra
-    , IsRecentEra
-    , RecentEra (RecentEraBabbage, RecentEraConway)
-    , cardanoEraFromRecentEra
-    , shelleyBasedEraFromRecentEra
-    )
 
 spec :: Spec
 spec = describe "TransactionSpec" $ do

lib/unit/test/unit/Cardano/WalletSpec.hs

@@ -412,6 +412,10 @@ import qualified Cardano.Wallet.Read as Read
 import qualified Cardano.Wallet.Read.Hash as Hash
 import qualified Cardano.Wallet.Submissions.Submissions as Smbs
 import qualified Cardano.Wallet.Submissions.TxStatus as Sbms
+import qualified Cardano.Write.Eras as Write
+    ( AnyRecentEra (AnyRecentEra)
+    , RecentEra (RecentEraBabbage, RecentEraConway)
+    )
 import qualified Data.ByteArray as BA
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as B8
@@ -420,10 +424,6 @@ import qualified Data.List as L
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
-import qualified Internal.Cardano.Write.Tx as Write
-    ( AnyRecentEra (AnyRecentEra)
-    , RecentEra (RecentEraBabbage, RecentEraConway)
-    )
 
 spec :: Spec
 spec = describe "Cardano.WalletSpec" $ do