wip Cardano.Api → Cardano.Api.Typed and HardForkBlock support

cardano-foundation · Jul 18, 2020 · d8c7ea2 · d8c7ea2
1 parent 50a95e2
commit d8c7ea2
Show file tree

Hide file tree

Showing 8 changed files with 858 additions and 269 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Network.hs b/lib/core/src/Cardano/Wallet/Network.hs
@@ -137,8 +137,9 @@ data NetworkLayer m target block = NetworkLayer
         :: SealedTx -> ExceptT ErrPostTx m ()
         -- ^ Broadcast a transaction to the chain producer
 
-    , stakeDistribution
-        :: GetStakeDistribution target m
+    -- adding block causes issues in Functor instance
+    -- , stakeDistribution
+    --     :: GetStakeDistribution target block m
 
     , getAccountBalance
         :: ChimericAccount
@@ -237,7 +238,7 @@ defaultRetryPolicy =
                                  Queries
 -------------------------------------------------------------------------------}
 
-type family GetStakeDistribution target (m :: * -> *) :: *
+type family GetStakeDistribution target block (m :: * -> *) :: *
 
 {-------------------------------------------------------------------------------
                                 Chain Sync

diff --git a/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs b/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs
@@ -64,8 +64,6 @@ import GHC.Generics
     ( Generic )
 import Numeric.Natural
     ( Natural )
-import Ouroboros.Consensus.HardFork.History.EraParams
-    ( EraParams (..), noLowerBoundSafeZone )
 import Ouroboros.Consensus.HardFork.History.Qry
     ( Qry, runQuery, slotToEpoch )
 import Ouroboros.Consensus.HardFork.History.Summary
@@ -89,25 +87,16 @@ epochOf slot = do
 -- TODO: The type should be changed to @Interpreter@ when we bump
 -- ouroboros-consensus.
 singleEraInterpreter :: GenesisParameters -> Summary '[x]
-singleEraInterpreter gp = neverForksSummary $
-    EraParams
-        { eraEpochSize =
-            Cardano.EpochSize
+singleEraInterpreter gp = neverForksSummary sz len
+  where
+    sz = Cardano.EpochSize
             . fromIntegral
             . unEpochLength
             $ gp ^. #getEpochLength
-
-        , eraSlotLength =
-            Cardano.mkSlotLength
+    len = Cardano.mkSlotLength
             . unSlotLength
             $ gp ^. #getSlotLength
 
-        , eraSafeZone =
-            noLowerBoundSafeZone (k * 2)
-        }
-  where
-    k = fromIntegral $ getQuantity $ getEpochStability gp
-
 -- -----------------------------------------------------------------------------
 -- Legacy functions
 -- These only work for a single era. We need to stop using them

diff --git a/lib/shelley/cardano-wallet-shelley.cabal b/lib/shelley/cardano-wallet-shelley.cabal
@@ -65,6 +65,8 @@ library
     , network-mux
     , optparse-applicative
     , ouroboros-consensus
+    , ouroboros-consensus-byron
+    , ouroboros-consensus-cardano
     , ouroboros-consensus-shelley
     , ouroboros-network
     , ouroboros-network-framework
@@ -85,6 +87,7 @@ library
   hs-source-dirs:
       src
   exposed-modules:
+      Cardano.Wallet.Byron.Compatibility
       Cardano.Wallet.Shelley
       Cardano.Wallet.Shelley.Api.Server
       Cardano.Wallet.Shelley.Compatibility