Skip to content

Commit

Permalink
Add public module Cardano.Write.Eras
Browse files Browse the repository at this point in the history
  • Loading branch information
HeinrichApfelmus committed Oct 17, 2024
1 parent d214485 commit b513018
Show file tree
Hide file tree
Showing 19 changed files with 104 additions and 35 deletions.
6 changes: 4 additions & 2 deletions lib/api/src/Cardano/Wallet/Api/Http/Server/Error.hs
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,11 @@ import qualified Data.Foldable as F
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
import qualified Cardano.Write.Eras as Write
( IsRecentEra
, serializeTx
)
import qualified Internal.Cardano.Write.Tx as Write
( serializeTx
)
import qualified Internal.Cardano.Write.Tx as WriteTx
import qualified Internal.Cardano.Write.Tx.Balance as Write
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Cardano.Wallet.Api.Types.Error
import Fmt
( pretty
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( IsRecentEra (..)
)
import Internal.Cardano.Write.Tx.Balance
Expand Down
12 changes: 7 additions & 5 deletions lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ import Fmt
import GHC.Generics
( Generic
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( AnyRecentEra (..)
)
import Internal.Cardano.Write.Tx.Balance
Expand Down Expand Up @@ -891,16 +891,18 @@ import qualified Data.List.NonEmpty as NE
import qualified Data.Map.Strict as Map
import qualified Data.Set as Set
import qualified Data.Text as T
import qualified Cardano.Write.Eras as Write
( IsRecentEra
, RecentEra
, cardanoEra
, cardanoEraFromRecentEra
)
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
Expand Down
2 changes: 1 addition & 1 deletion lib/api/src/Cardano/Wallet/Api/Types/Era.hs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ 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
)
Expand Down
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.Eras
Cardano.Write.Tx

library internal
Expand Down
55 changes: 55 additions & 0 deletions lib/balance-tx/lib/main/Cardano/Write/Eras.hs
Original file line number Diff line number Diff line change
@@ -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
, ShelleyLedgerEra
, CardanoApiEra
, ConwayEra
, IsRecentEra (..)
, LatestLedgerEra
, MaybeInRecentEra (..)
, RecentEra (..)
, RecentEraConstraints
, allRecentEras
, cardanoEra
, cardanoEraFromRecentEra
, fromAnyCardanoEra
, fromRecentEra
, shelleyBasedEra
, shelleyBasedEraFromRecentEra
, toAnyCardanoEra
, toRecentEra
)
1 change: 1 addition & 0 deletions lib/network-layer/cardano-wallet-network-layer.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ library
, base
, bytestring
, cardano-api
, cardano-balance-tx
, cardano-balance-tx:internal
, cardano-binary
, cardano-crypto-class
Expand Down
6 changes: 3 additions & 3 deletions lib/network-layer/src/Cardano/Wallet/Network.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 (..)
)
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ import Fmt
import GHC.Stack
( HasCallStack
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( MaybeInRecentEra (..)
)
import Network.Mux
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Cardano.Wallet.Network.LocalStateQuery.Extra
import Data.Set
( Set
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( MaybeInRecentEra (..)
)
import Ouroboros.Consensus.Cardano
Expand Down
1 change: 1 addition & 0 deletions lib/unit/cardano-wallet-unit.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ library test-common
, base
, bytestring
, cardano-api
, cardano-balance-tx
, cardano-balance-tx:internal
, cardano-wallet
, cardano-wallet-network-layer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ import Internal.Cardano.Write.Tx.Gen
)

import qualified Data.ByteString.Char8 as B8
import qualified Cardano.Write.Eras as Write
import qualified Internal.Cardano.Write.Tx as Write

{-----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ import Fmt
, (+||)
, (||+)
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( AnyRecentEra (..)
, CardanoApiEra
, IsRecentEra
Expand Down
18 changes: 11 additions & 7 deletions lib/wallet/src/Cardano/Wallet.hs
Original file line number Diff line number Diff line change
Expand Up @@ -802,10 +802,12 @@ import GHC.Stack
import GHC.TypeNats
( Nat
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( MaybeInRecentEra (..)
, recentEra
, toRecentEraGADT
)
import Internal.Cardano.Write.Tx
( toRecentEraGADT
)
import Internal.Cardano.Write.Tx.Balance
( ChangeAddressGen (..)
Expand Down Expand Up @@ -873,19 +875,21 @@ import qualified Data.List.NonEmpty as NE
import qualified Data.Set as Set
import qualified Data.Text as T
import qualified Data.Vector as V
import qualified Internal.Cardano.Write.Tx as Write
import qualified Cardano.Write.Eras as Write
( AnyRecentEra
, CardanoApiEra
, ErrInvalidTxOutInEra
, FeePerByte
, IsRecentEra (..)
, MaybeInRecentEra (..)
, RecentEra (..)
, cardanoEraFromRecentEra
)
import qualified Internal.Cardano.Write.Tx as Write
( ErrInvalidTxOutInEra
, FeePerByte
, PParams
, PParamsInAnyRecentEra (PParamsInAnyRecentEra)
, RecentEra (..)
, Tx
, UTxO (UTxO)
, cardanoEraFromRecentEra
, feeOfBytes
, forceUTxOToEra
, fromCardanoApiTx
Expand Down
2 changes: 1 addition & 1 deletion lib/wallet/src/Cardano/Wallet/Delegation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import qualified Cardano.Wallet.DB.WalletState as WalletState
import qualified Cardano.Wallet.Primitive.Types as W
import qualified Cardano.Wallet.Transaction as Tx
import qualified Data.Set as Set
import qualified Internal.Cardano.Write.Tx as Write
import qualified Cardano.Write.Eras as Write

-- | The data type that represents client's delegation request.
-- Stake key registration is made implicit by design:
Expand Down
16 changes: 9 additions & 7 deletions lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ import Data.Word
( Word64
, Word8
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( CardanoApiEra
, RecentEra (..)
)
Expand Down Expand Up @@ -274,22 +274,24 @@ import qualified Data.List as L
import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.Text as T
import qualified Internal.Cardano.Write.Tx as Write
import qualified Cardano.Write.Eras as Write
( CardanoApiEra
, Coin
, FeePerByte
, IsRecentEra (recentEra)
, PParams
, RecentEra (RecentEraBabbage, RecentEraConway)
, shelleyBasedEra
, shelleyBasedEraFromRecentEra
)
import qualified Internal.Cardano.Write.Tx as Write
( Coin
, FeePerByte
, PParams
, Tx
, TxOut
, computeMinimumCoinForTxOut
, feeOfBytes
, fromCardanoApiTx
, getFeePerByte
, isBelowMinimumCoinForTxOut
, shelleyBasedEra
, shelleyBasedEraFromRecentEra
, toCardanoApiTx
)
import qualified Internal.Cardano.Write.Tx.Sign as Write
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet/src/Cardano/Wallet/Transaction/Delegation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ import Cryptography.Hash.Blake
import Data.ByteString.Short
( toShort
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( CardanoApiEra
, RecentEra (RecentEraBabbage, RecentEraConway)
, RecentEra (..)
)

import qualified Cardano.Api as Cardano
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet/src/Cardano/Wallet/Transaction/Voting.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ import Cryptography.Hash.Blake
import Data.ByteString.Short
( toShort
)
import Internal.Cardano.Write.Tx
import Cardano.Write.Eras
( CardanoApiEra
, RecentEra (RecentEraBabbage, RecentEraConway)
, RecentEra (..)
)

import qualified Cardano.Api as Cardano
Expand Down

0 comments on commit b513018

Please sign in to comment.