Add era parameter to mock Block type

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO.hs

@@ -85,7 +85,7 @@ data WalletBootEnv m = WalletBootEnv
         -- ^ Logger for the wallet.
         , genesisData :: Read.GenesisData
         -- ^ Genesis data for the wallet.
-        , networkEnv :: Network.NetworkEnv m Read.Block
+        , networkEnv :: Network.NetworkEnv m (Read.EraValue Read.Block)
         -- ^ Network environment for the wallet.
     }
 
@@ -221,7 +221,8 @@ getCustomerHistories
 getCustomerHistories a w =
     Wallet.getCustomerHistories a <$> readWalletState w
 
-rollForward :: WalletInstance -> NonEmpty Read.Block -> tip -> IO ()
+rollForward
+    :: WalletInstance -> NonEmpty (Read.EraValue Read.Block) -> tip -> IO ()
 rollForward w blocks _nodeTip =
     onWalletState w
         $ Delta.update

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO/Network/Mock.hs

@@ -48,7 +48,7 @@ import qualified Cardano.Wallet.Deposit.Write as Write
 ------------------------------------------------------------------------------}
 newNetworkEnvMock
     :: (MonadDelay m, MonadSTM m)
-    => m (NetworkEnv m Read.Block)
+    => m (NetworkEnv m (Read.Block Read.Conway))
 newNetworkEnvMock = do
     mchain <- newTVarIO []
     mtip <- newTVarIO Read.GenesisPoint

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO/Network/Type.hs

@@ -1,13 +1,16 @@
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE NamedFieldPuns #-}
 module Cardano.Wallet.Deposit.IO.Network.Type
     ( NetworkEnv (..)
+    , mapBlock
     , ChainFollower (..)
     ) where
 
 import Prelude
 
 import Cardano.Wallet.Network
     ( ChainFollower (..)
+    , mapChainFollower
     )
 import Control.Tracer
     ( Tracer
@@ -45,6 +48,17 @@ data NetworkEnv m block = NetworkEnv
 
     }
 
+mapBlock
+    :: Functor m
+    => (block1 -> block2)
+    -> NetworkEnv m block1
+    -> NetworkEnv m block2
+mapBlock f NetworkEnv{chainSync,postTx} = NetworkEnv
+    { chainSync = \tr follower ->
+        chainSync tr (mapChainFollower id id id (fmap f) follower)
+    , postTx = postTx
+    }
+
 {-------------------------------------------------------------------------------
     Errors
 -------------------------------------------------------------------------------}

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure.hs

@@ -175,11 +175,13 @@ fromXPubAndGenesis xpub knownCustomerCount _ =
 getWalletTip :: WalletState -> Read.ChainPoint
 getWalletTip = error "getWalletTip"
 
-rollForwardMany :: NonEmpty Read.Block -> WalletState -> WalletState
+rollForwardMany
+    :: NonEmpty (Read.EraValue Read.Block) -> WalletState -> WalletState
 rollForwardMany blocks w = foldl' (flip rollForwardOne) w blocks
 
-rollForwardOne :: Read.Block -> WalletState -> WalletState
-rollForwardOne block w =
+rollForwardOne
+    :: Read.EraValue Read.Block -> WalletState -> WalletState
+rollForwardOne (Read.EraValue block) w =
     w
         { utxoHistory = rollForwardUTxO isOurs block (utxoHistory w)
         , submissions = Delta.apply (Sbm.rollForward block) (submissions w)
@@ -189,7 +191,8 @@ rollForwardOne block w =
     isOurs = Address.isOurs (addresses w)
 
 rollForwardUTxO
-    :: (Address -> Bool) -> Read.Block -> UTxOHistory -> UTxOHistory
+    :: Read.IsEra era
+    => (Address -> Bool) -> Read.Block era -> UTxOHistory -> UTxOHistory
 rollForwardUTxO isOurs block u =
     UTxOHistory.appendBlock slot deltaUTxO u
   where

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure/Balance.hs

@@ -57,7 +57,8 @@ availableUTxO u pending =
 --
 -- Returns both a delta and the new value.
 applyBlock
-    :: IsOurs Read.Address -> Read.Block -> UTxO -> (DeltaUTxO, UTxO)
+    :: Read.IsEra era
+    => IsOurs Read.Address -> Read.Block era -> UTxO -> (DeltaUTxO, UTxO)
 applyBlock isOurs block u0 =
     (DeltaUTxO.concat $ reverse dus, u1)
   where

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure/Submissions.hs

@@ -62,7 +62,7 @@ add = undefined
 listInSubmission :: TxSubmissions -> Set Read.Tx
 listInSubmission = undefined
 
-rollForward :: Read.Block -> DeltaTxSubmissions
+rollForward :: Read.Block era -> DeltaTxSubmissions
 rollForward block = [ Sbm.RollForward tip txs ]
   where
     tip = undefined block

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs

@@ -8,7 +8,11 @@
 --
 -- TODO: Match this up with the @Read@ hierarchy.
 module Cardano.Wallet.Deposit.Read
-    ( Network (..)
+    ( Read.IsEra
+    , Read.EraValue (..)
+    , Read.Conway
+
+    , Network (..)
     , Read.SlotNo
     , Read.ChainPoint (..)
     , Slot
@@ -129,11 +133,10 @@ type TxWitness = ()
 type BlockNo = Natural
 
 -- type Block = O.CardanoBlock O.StandardCrypto
-data Block = Block
+data Block era = Block
     { blockHeader :: BHeader
-    , transactions :: [Read.Tx Read.Conway]
+    , transactions :: [Read.Tx era]
     }
-    deriving (Eq, Show)
 
 data BHeader = BHeader
     { blockHeaderBody :: BHBody
@@ -154,7 +157,7 @@ data BHBody = BHBody
 type HashHeader = Read.RawHeaderHash
 type HashBBody = ()
 
-getChainPoint :: Block -> Read.ChainPoint
+getChainPoint :: Read.IsEra era => Block era -> Read.ChainPoint
 getChainPoint block =
     Read.BlockPoint
         { Read.slotNo = slot
@@ -167,7 +170,7 @@ getChainPoint block =
     slot = slotNo bhBody
 
 -- | Create a new block from a sequence of transaction.
-mockNextBlock :: Read.ChainPoint -> [Read.Tx Read.Conway] -> Block
+mockNextBlock :: Read.ChainPoint -> [Read.Tx Read.Conway] -> Block Read.Conway
 mockNextBlock old txs =
     Block
         { blockHeader = BHeader

lib/customer-deposit-wallet/test/scenario/Test/Scenario/Blockchain.hs

@@ -35,6 +35,7 @@ import Cardano.Wallet.Deposit.IO.Network.Mock
     )
 import Cardano.Wallet.Deposit.IO.Network.Type
     ( NetworkEnv (..)
+    , mapBlock
     )
 import Cardano.Wallet.Deposit.Pure
     ( BIP32Path
@@ -68,14 +69,14 @@ assert False = error "Assertion failed!"
 -- | Environment for scenarios.
 data ScenarioEnv = ScenarioEnv
     { genesisData :: Read.GenesisData
-    , networkEnv :: NetworkEnv IO Read.Block
+    , networkEnv :: NetworkEnv IO (Read.EraValue Read.Block)
     , faucet :: Faucet
     }
 
 -- | Acquire and release a mock environment for a blockchain
 withScenarioEnvMock :: (ScenarioEnv -> IO a) -> IO a
 withScenarioEnvMock action = do
-    networkEnv <- newNetworkEnvMock
+    networkEnv <- mapBlock Read.EraValue <$> newNetworkEnvMock
     action
         $ ScenarioEnv
             { genesisData = error "TODO: Mock Genesis Data"