Upd cardano pins

Author: tweag-ev-ak

app/Options.hs

@@ -4,7 +4,7 @@ import Cardano.Api
 import Data.Foldable (fold)
 import Network.Wai.Handler.Warp (Port)
 import Options.Applicative
-import Ouroboros.Network.Protocol.LocalStateQuery.Type (LeashID (..))
+import Ouroboros.Network.Protocol.LocalStateQuery.Type (LeashId (..))
 import System.Environment.Blank (getEnvDefault)
 import Text.Read (readMaybe)
 
@@ -25,7 +25,7 @@ data Options = Options
     , httpServerPort :: Port
     , logsPath :: Maybe FilePath
     , sqlitePath :: Maybe FilePath
-    , leashId :: LeashID
+    , leashId :: LeashId
     }
     deriving (Show, Eq)
 
@@ -99,7 +99,7 @@ mkParseOptions = do
                 <> help "Path to sqlite database"
             )
     optLeashId =
-        LeashID
+        LeashId
             <$> option
                 auto
                 ( long "leash-id"

cabal.project

@@ -28,8 +28,8 @@ constraints:
 source-repository-package
     type: git
     location: https://github.com/tweag/ouroboros-network
-    tag: 461bbd3f6a27bc282d8a2b7c54e9ef929f30efb0
-    --sha256: sha256-lEw68KGx16CkBktEeS4xyth6zh9doLewQqxHAiUrxcQ=
+    tag: 932ab7740673f5560b3d382e9024cb247586eb2a
+    --sha256: sha256-Bh0QU0XzHO+zgGQ7mUyIl0rC/2rOznU/ea0XOlXW2NU=
     subdir:
       ouroboros-network
       ouroboros-network-protocols
@@ -39,8 +39,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/tweag/ouroboros-consensus
-    tag: 41798759677482cd0ff46354ef44fa4e20640134
-    --sha256: sha256-0iWWFuVAe2aKfGbjSW/WNSJwdHyixf326fwFIGOOcJI=
+    tag: 3a8f660f6cc0b25e798b9e2b47b3b6675bfa4169
+    --sha256: sha256-80dy1XW2/4Dh6PclQGmZBaLDwcnzfOmnq9+B/Ng84lY=
     subdir:
       ouroboros-consensus
       ouroboros-consensus-cardano
@@ -50,7 +50,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/tweag/cardano-api
-    tag: e18961dffc32872d4293e06dddcf376cd1784b65
-    --sha256: sha256-OhA7E8Jl04eDybfpz0Ks+jH7X4yDUI4O3mY2lMj6eHE= 
+    tag: 19e8ce17e42ed0b77a8f55d4086d4319b2eb1f7a
+    --sha256: sha256-ixo+JhDXT5hse/y1YrabTYz9f16Pge9JvYHRZnTItxM=
     subdir:
       cardano-api

docs/specification.md

@@ -362,7 +362,7 @@ https://ouroboros-consensus.cardano.intersectmbo.org/docs/references/miscellaneo
 
 We consider the leashing implementation utilising the existing LoE mechanism.
 
-1. We introduce a `LeashingState blk = Map LeashID (AnchoredFragment (HeaderWithTime blk))` structure to keep the leashing fragments associated with each leashing client.
+1. We introduce a `LeashingState blk = Map LeashId (AnchoredFragment (HeaderWithTime blk))` structure to keep the leashing fragments associated with each leashing client.
 2. We update the `LocalStateQuery` server to interact with that state:
     - If a new client connects to the server with `leashId`, the server will put the `leashId` together with the client's leashing fragment into the leashing state;
     - The leashing fragment is calculated using the current chain of the node and the `Target (Point Block)` provided by user. It's either a `SpecificPoint pt`, `ImmutableTip` or `VolatileTip`.

flake.lock

@@ -29,7 +29,7 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    cardano-node.url = "github:tweag/cardano-node/fd69ca5b5b34c576d1a5375e8f1f13902ce5d822";
+    cardano-node.url = "github:tweag/cardano-node/3573ea1950e088b6ab251b1cd67287d412ba083c";
   };
 
   outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system:

flake.nix

@@ -113,7 +113,7 @@ sysStartQuery = do
 
 runLocalStateQueryExpr ::
     C.LocalNodeConnectInfo ->
-    Net.Query.LeashID ->
+    Net.Query.LeashId ->
     C.ChainPoint ->
     C.LocalStateQueryExpr C.BlockInMode C.ChainPoint C.QueryInMode () IO a ->
     IO a

lib/PSR/Chain.hs

@@ -20,7 +20,7 @@ import Data.Map qualified as Map
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Yaml (decodeFileEither)
-import Ouroboros.Network.Protocol.LocalStateQuery.Type (LeashID)
+import Ouroboros.Network.Protocol.LocalStateQuery.Type (LeashId)
 import PSR.Chain (mkLocalNodeConnectInfo)
 import PSR.Types (deriveJSONRecord, deriveJSONSimpleSum)
 import PlutusLedgerApi.Common (
@@ -92,7 +92,7 @@ data ConfigMap = ConfigMap
     , cmShadowScripts :: Map C.ScriptHash [ResolvedScript]
     , cmTargetScriptNames :: Map C.ScriptHash (Maybe Text)
     , cmLocalNodeConn :: C.LocalNodeConnectInfo
-    , cmLeashId :: LeashID
+    , cmLeashId :: LeashId
     , cmRunningMode :: RunningMode
     }
 
@@ -194,7 +194,7 @@ readScriptFile scriptYamlDir scrutScriptHash (ix, ScriptDetails{..}) = do
             }
 
 -- | Parse the config from a given Yaml file on disk
-readConfigMap :: FilePath -> C.NetworkId -> C.SocketPath -> LeashID -> IO (Either String ConfigMap)
+readConfigMap :: FilePath -> C.NetworkId -> C.SocketPath -> LeashId -> IO (Either String ConfigMap)
 readConfigMap scriptYaml networkId socketPath leashId = runExceptT $ do
     ConfigMapFile{..} <- withExceptT show $ ExceptT $ decodeFileEither scriptYaml
     let scriptYamlDir = dropFileName scriptYaml

lib/PSR/ConfigMap.hs

@@ -33,7 +33,7 @@ import Data.Maybe (mapMaybe)
 import Data.Set (Set)
 import Data.Set qualified as Set
 import GHC.Exts qualified as List (IsList (..))
-import Ouroboros.Network.Protocol.LocalStateQuery.Type (LeashID)
+import Ouroboros.Network.Protocol.LocalStateQuery.Type (LeashId)
 import PSR.Chain
 import PSR.ConfigMap (ConfigMap (..), ResolvedScript (..))
 import PSR.Evaluation.Api (evaluateTransactionExecutionUnitsShelley)
@@ -97,7 +97,7 @@ mkBlockContext ::
     ContextBuilderMetrics ->
     C.BlockHeader ->
     C.LocalNodeConnectInfo ->
-    LeashID ->
+    LeashId ->
     C.ChainPoint ->
     C.AlonzoEraOnwards era ->
     [C.Tx era] ->
@@ -117,7 +117,7 @@ mkBlockContext metrics bh conn leashId prevCp era txs = do
 -- NOTE: This is a costly function, but we only run it once.
 getSpendProjectedUtxoMap ::
     C.LocalNodeConnectInfo ->
-    LeashID ->
+    LeashId ->
     C.ChainPoint ->
     C.ShelleyBasedEra era ->
     Set C.ScriptHash ->