Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ADP-3185] Export era-related types and functions from Cardano.Write.Era. #4450

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/balance-tx/cardano-balance-tx.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ library
build-depends:
, cardano-balance-tx:internal
exposed-modules:
Cardano.Write.Era
Cardano.Write.Tx

library internal
Expand Down
14 changes: 14 additions & 0 deletions lib/balance-tx/lib/main/Cardano/Write/Era.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- |
-- Copyright: © 2024 Cardano Foundation
-- License: Apache-2.0
--
module Cardano.Write.Era
( IsRecentEra (recentEra)
, RecentEra (RecentEraBabbage, RecentEraConway)
)
where

import Internal.Cardano.Write.Tx
( IsRecentEra (recentEra)
, RecentEra (RecentEraBabbage, RecentEraConway)
)
6 changes: 4 additions & 2 deletions lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Error.hs
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,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.Era as Write
( IsRecentEra
)
import qualified Data.Aeson as Aeson
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as BL
Expand All @@ -214,8 +217,7 @@ import qualified Data.List.NonEmpty as NE
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import qualified Internal.Cardano.Write.Tx as Write
( IsRecentEra
, serializeTx
( serializeTx
, toAnyCardanoEra
)
import qualified Internal.Cardano.Write.Tx.Balance as Write
Expand Down
6 changes: 4 additions & 2 deletions lib/wallet/api/http/Cardano/Wallet/Api/Http/Shelley/Server.hs
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,10 @@ import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as TxOut
import qualified Cardano.Wallet.Primitive.Types.UTxO as UTxO
import qualified Cardano.Wallet.Read as Read
import qualified Cardano.Wallet.Registry as Registry
import qualified Cardano.Write.Era as Write
( IsRecentEra
, RecentEra
)
import qualified Control.Concurrent.Concierge as Concierge
import qualified Data.ByteString as BS
import qualified Data.Foldable as F
Expand All @@ -926,9 +930,7 @@ import qualified Data.Map.Strict as Map
import qualified Data.Set as Set
import qualified Internal.Cardano.Write.Tx as Write
( Datum (DatumHash, NoDatum)
, IsRecentEra
, PParamsInAnyRecentEra (PParamsInAnyRecentEra)
, RecentEra
, TxIn
, TxOutInRecentEra (TxOutInRecentEra)
, cardanoEraFromRecentEra
Expand Down
4 changes: 3 additions & 1 deletion lib/wallet/src/Cardano/Wallet.hs
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,9 @@ import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as TxOut
import qualified Cardano.Wallet.Primitive.Types.UTxO as UTxO
import qualified Cardano.Wallet.Primitive.Types.UTxOStatistics as UTxOStatistics
import qualified Cardano.Wallet.Read as Read
import qualified Cardano.Write.Era as Write
( RecentEra
)
import qualified Data.ByteArray as BA
import qualified Data.Delta.Update as Delta
import qualified Data.Foldable as F
Expand All @@ -846,7 +849,6 @@ import qualified Internal.Cardano.Write.Tx as Write
, IsRecentEra
, PParams
, PParamsInAnyRecentEra (PParamsInAnyRecentEra)
, RecentEra
, Tx
, UTxO (UTxO)
, cardanoEraFromRecentEra
Expand Down
6 changes: 4 additions & 2 deletions lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,10 @@ import qualified Cardano.Wallet.Primitive.Ledger.Convert as Convert
import qualified Cardano.Wallet.Primitive.Ledger.Shelley as Compatibility
import qualified Cardano.Wallet.Primitive.Types.AssetId as AssetId
import qualified Cardano.Wallet.Primitive.Types.TokenMap as TokenMap
import qualified Cardano.Write.Era as Write
( IsRecentEra (recentEra)
, RecentEra (RecentEraBabbage, RecentEraConway)
)
import qualified Data.ByteString as BS
import qualified Data.Foldable as F
import qualified Data.List as L
Expand All @@ -267,9 +271,7 @@ import qualified Data.Text as T
import qualified Internal.Cardano.Write.Tx as Write
( CardanoApiEra
, FeePerByte
, IsRecentEra (recentEra)
, PParams
, RecentEra (RecentEraBabbage, RecentEraConway)
, Tx
, TxOut
, computeMinimumCoinForTxOut
Expand Down
4 changes: 3 additions & 1 deletion lib/wallet/src/Cardano/Wallet/Transaction/Delegation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ import Cardano.Wallet.Primitive.Types.Pool
import Cardano.Wallet.Transaction
( DelegationAction (..)
)
import qualified Cardano.Write.Era as Write
( RecentEra (RecentEraBabbage, RecentEraConway)
)
import Crypto.Hash.Extra
( blake2b224
)
Expand All @@ -45,7 +48,6 @@ import qualified Cardano.Api.Shelley as Cardano
import qualified Cardano.Ledger.Keys as Ledger
import qualified Internal.Cardano.Write.Tx as Write
( CardanoApiEra
, RecentEra (RecentEraBabbage, RecentEraConway)
)

{-----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ 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.Era as Write
( IsRecentEra
, RecentEra (RecentEraBabbage, RecentEraConway)
)
import qualified Data.ByteArray as BA
import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as B8
Expand All @@ -363,9 +367,7 @@ import qualified Data.Text.Encoding as T
import qualified Internal.Cardano.Write.Tx as Write
( BabbageEra
, CardanoApiEra
, IsRecentEra
, PParams
, RecentEra (RecentEraBabbage, RecentEraConway)
, cardanoEraFromRecentEra
, shelleyBasedEra
, shelleyBasedEraFromRecentEra
Expand Down
4 changes: 3 additions & 1 deletion lib/wallet/test/unit/Cardano/WalletSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ import qualified Cardano.Wallet.Primitive.Types.TokenMap as TokenMap
import qualified Cardano.Wallet.Read as Read
import qualified Cardano.Wallet.Submissions.Submissions as Smbs
import qualified Cardano.Wallet.Submissions.TxStatus as Sbms
import qualified Cardano.Write.Era as Write
( RecentEra (RecentEraBabbage, RecentEraConway)
)
import qualified Data.ByteArray as BA
import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as B8
Expand All @@ -414,7 +417,6 @@ 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
Expand Down
Loading