Merge pull request #578 from input-output-hk/kll/merge-main-into-next…

…-node

Merge #574 and #575 from main into next-node

plutus-streaming/plutus-streaming.cabal

@@ -30,11 +30,20 @@ library
   import:          lang
   hs-source-dirs:  src
   exposed-modules: Plutus.Streaming
+
+  --------------------------
+  -- Other IOG dependencies
+  --------------------------
   build-depends:
-    , async
-    , base               >=4.9  && <5
     , cardano-api        >=1.35
     , ouroboros-network
+
+  ------------------------
+  -- Non-IOG dependencies
+  ------------------------
+  build-depends:
+    , async
+    , base       >=4.9 && <5
     , stm
     , streaming
 
@@ -46,14 +55,25 @@ executable plutus-streaming-example-1
     Common
     Orphans
 
+  --------------------
+  -- Local components
+  --------------------
+  build-depends:  plutus-streaming
+
+  --------------------------
+  -- Other IOG dependencies
+  --------------------------
+  build-depends:  cardano-api >=1.35
+
+  ------------------------
+  -- Non-IOG dependencies
+  ------------------------
   build-depends:
     , aeson
-    , base                  >=4.9  && <5
+    , base                  >=4.9 && <5
     , base16-bytestring
     , bytestring
-    , cardano-api           >=1.35
     , optparse-applicative
-    , plutus-streaming
     , streaming
     , text
 
@@ -65,16 +85,28 @@ executable plutus-streaming-example-2
     Common
     Orphans
 
+  --------------------
+  -- Local components
+  --------------------
+  build-depends:
+    , plutus-ledger        >=1.0.0
+    , plutus-script-utils  >=1.0.0
+    , plutus-streaming
+
+  --------------------------
+  -- Other IOG dependencies
+  --------------------------
+  build-depends:  cardano-api >=1.35
+
+  ------------------------
+  -- Non-IOG dependencies
+  ------------------------
   build-depends:
     , aeson
-    , base                  >=4.9   && <5
+    , base                  >=4.9 && <5
     , base16-bytestring
     , bytestring
-    , cardano-api           >=1.35
     , optparse-applicative
-    , plutus-ledger         >=1.0.0
-    , plutus-script-utils   >=1.0.0
-    , plutus-streaming
     , streaming
 
 executable plutus-streaming-example-3
@@ -85,13 +117,25 @@ executable plutus-streaming-example-3
     Common
     Orphans
 
+  --------------------
+  -- Local components
+  --------------------
+  build-depends:
+    , plutus-chain-index-core  >=1.0.0
+    , plutus-streaming
+
+  --------------------------
+  -- Other IOG dependencies
+  --------------------------
+  build-depends:  cardano-api >=1.35
+
+  ------------------------
+  -- Non-IOG dependencies
+  ------------------------
   build-depends:
     , aeson
-    , base                     >=4.9   && <5
+    , base                  >=4.9 && <5
     , base16-bytestring
     , bytestring
-    , cardano-api              >=1.35
     , optparse-applicative
-    , plutus-chain-index-core  >=1.0.0
-    , plutus-streaming
     , streaming