Bump dependencies to 1.33.0 + local-tx-monitor

  This is the same dependencies set as for cardano-node's 1.33.0 except for ouroboros-network which includes the various commits that enable the local-tx-monitor protocol. To be tested, this requires a compiled version of the node that also include this revision of ouroboros-network.

Dockerfile

@@ -43,7 +43,7 @@ ENTRYPOINT ["/bin/ogmios"]
 # --------------------- RUN (cardano-node & ogmios) -------------------------- #
 #                                                                              #
 
-FROM inputoutput/cardano-node:1.31.0 as cardano-node-ogmios
+FROM inputoutput/cardano-node:1.33.0 as cardano-node-ogmios
 
 ARG NETWORK=mainnet
 

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.5"
 
 services:
   cardano-node:
-    image: inputoutput/cardano-node:1.31.0
+    image: inputoutput/cardano-node:1.33.0
     command: [
       "run",
       "--config", "/config/config.json",

server/cabal.project

@@ -1,4 +1,4 @@
-index-state: 2021-09-15T00:00:00Z
+index-state: 2021-12-07T00:00:00Z
 
 packages:
   ./
@@ -52,8 +52,8 @@ allow-newer:
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 2cbe363874d0261bc62f52185cf23ed492cf4859
-  --sha256: 0x5j0cynlc9kiyj9w7casax477z3fb74pfsyfl373dn7rv1grg4d
+  tag: 814df2c146f5d56f8c35a681fe75e85b905aed5d
+  --sha256: 1hr00wqzmcyc3x0kp2hyw78rfmimf6z4zd4vv85b9zv3nqbjgrik
   subdir:
     cardano-api
 
@@ -66,8 +66,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0
-  --sha256: 0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4
+  tag: 41545ba3ac6b3095966316a99883d678b5ab8da8
+  --sha256: 0icq9y3nnl42fz536da84414av36g37894qnyw4rk3qkalksqwir
   subdir:
     base-deriving-via
     binary
@@ -88,9 +88,9 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: bf008ce028751cae9fb0b53c3bef20f07c06e333
-  --sha256: 0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
+  --sha256: 0avzyiqq0m8njd41ck9kpn992yq676b1az9xs77977h7cf85y4wm
   subdir:
     eras/alonzo/impl
     eras/alonzo/test-suite
@@ -100,17 +100,17 @@ source-repository-package
     eras/byron/ledger/executable-spec
     eras/byron/ledger/impl
     eras/byron/ledger/impl/test
-    eras/shelley-ma/impl
-    eras/shelley-ma/test-suite
-    eras/shelley/chain-and-ledger/dependencies/non-integer
-    eras/shelley/chain-and-ledger/executable-spec
-    eras/shelley/chain-and-ledger/shelley-spec-ledger-test
     eras/shelley/impl
     eras/shelley/test-suite
+    eras/shelley-ma/impl
+    eras/shelley-ma/test-suite
+    libs/cardano-data
     libs/cardano-ledger-core
     libs/cardano-ledger-pretty
     libs/cardano-protocol-tpraos
+    libs/compact-map
     libs/non-integral
+    libs/set-algebra
     libs/small-steps
     libs/small-steps-test
 
@@ -153,8 +153,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 94782e5ca52f234ff8eeddc6322a46cca0b69c0e
-  --sha256: 1da3pka4pn6sjf6w19d957aryjc9ip1a3g0vz7jz66pjri3v2n0j
+  tag: 32af91686b86dac7454eee8b8a8d6e97a80638da
+  --sha256: 0wkk40nw9vylc7imndhj3ca60mv59034mi2irnnilfvpzavj5zlz
   subdir:
     io-classes
     io-sim
@@ -165,6 +165,7 @@ source-repository-package
     ouroboros-consensus-byron
     ouroboros-consensus-byronspec
     ouroboros-consensus-byron-test
+    ouroboros-consensus-cardano
     ouroboros-consensus-shelley
     ouroboros-consensus-shelley-test
     ouroboros-consensus-cardano
@@ -173,6 +174,7 @@ source-repository-package
     ouroboros-network
     ouroboros-network-framework
     ouroboros-network-testing
+    strict-stm
     typed-protocols
     typed-protocols-cborg
     typed-protocols-examples

server/modules/cardano-client/package.yaml

@@ -28,6 +28,8 @@ library:
     - aeson
     - bytestring
     - cardano-ledger-byron
+    - cardano-ledger-core
+    - cardano-slotting
     - cborg
     - containers
     - contra-tracer

server/modules/cardano-client/src/Cardano/Network/Protocol/NodeToClient.hs

@@ -53,8 +53,12 @@ import Prelude hiding
 
 import Cardano.Chain.Slotting
     ( EpochSlots (..) )
+import Cardano.Ledger.Crypto
+    ( StandardCrypto )
 import Cardano.Network.Protocol.NodeToClient.Trace
     ( TraceClient (..) )
+import Cardano.Slotting.Slot
+    ( SlotNo )
 import Control.Monad.Class.MonadAsync
     ( MonadAsync )
 import Control.Monad.Class.MonadST
@@ -86,17 +90,17 @@ import Ouroboros.Consensus.Byron.Ledger.Config
 import Ouroboros.Consensus.Cardano
     ( CardanoBlock )
 import Ouroboros.Consensus.Cardano.Block
-    ( CardanoEras, CodecConfig (..), GenTx, HardForkApplyTxErr )
+    ( CardanoEras, CodecConfig (..), HardForkApplyTxErr )
 import Ouroboros.Consensus.Ledger.Query
     ( Query (..) )
+import Ouroboros.Consensus.Ledger.SupportsMempool
+    ( GenTx, GenTxId )
 import Ouroboros.Consensus.Network.NodeToClient
     ( ClientCodecs, Codecs' (..), clientCodecs )
 import Ouroboros.Consensus.Node.NetworkProtocolVersion
     ( SupportedNetworkProtocolVersion (..) )
 import Ouroboros.Consensus.Shelley.Ledger.Config
     ( CodecConfig (..) )
-import Ouroboros.Consensus.Shelley.Protocol
-    ( StandardCrypto )
 import Ouroboros.Network.Block
     ( Point (..), Tip (..) )
 import Ouroboros.Network.Channel

server/package.yaml

@@ -37,6 +37,7 @@ library:
     - -O2
   dependencies:
     - aeson
+    - async
     - base16
     - base64
     - base58-bytestring
@@ -48,6 +49,7 @@ library:
     - cardano-crypto
     - cardano-crypto-class
     - cardano-crypto-wrapper
+    - cardano-data
     - cardano-ledger-alonzo
     - cardano-ledger-byron
     - cardano-ledger-core
@@ -89,6 +91,7 @@ library:
     - scientific
     - serialise
     - small-steps
+    - stm
     - strict-containers
     - text
     - time

server/resolver.yaml

@@ -25,19 +25,22 @@ packages:
 - markov-chain-usage-model-0.0.0
 - monoidal-containers-0.6.0.1
 - moo-1.2
+- network-3.1.2.2
 - nothunks-0.1.3
 - partial-order-0.2.0.0
 - quickcheck-state-machine-0.7.0
+- random-1.2.1
 - size-based-0.1.2.0
 - statistics-linreg-0.3
 - Stream-0.4.7.2
 - streaming-binary-0.2.2.0
 - transformers-except-0.1.2
 - Unique-0.4.7.9
+- vector-0.12.3.1
 - witherable-0.4.1
 
 - git: https://github.com/input-output-hk/cardano-base
-  commit: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0
+  commit: 41545ba3ac6b3095966316a99883d678b5ab8da8
   subdirs:
   - base-deriving-via
   - binary
@@ -53,8 +56,8 @@ packages:
 - git: https://github.com/input-output-hk/cardano-crypto
   commit: f73079303f663e028288f9f4a9e08bcca39a923e
 
-- git: https://github.com/input-output-hk/cardano-ledger-specs
-  commit: bf008ce028751cae9fb0b53c3bef20f07c06e333
+- git: https://github.com/input-output-hk/cardano-ledger
+  commit: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
   subdirs:
   - eras/alonzo/impl
   - eras/alonzo/test-suite
@@ -68,18 +71,18 @@ packages:
   - eras/shelley/test-suite
   - eras/shelley-ma/impl
   - eras/shelley-ma/test-suite
-  - eras/shelley/chain-and-ledger/dependencies/non-integer
-  - eras/shelley/chain-and-ledger/executable-spec
-  - eras/shelley/chain-and-ledger/shelley-spec-ledger-test
+  - libs/cardano-data
   - libs/cardano-ledger-core
   - libs/cardano-ledger-pretty
   - libs/cardano-protocol-tpraos
+  - libs/compact-map
+  - libs/non-integral
+  - libs/set-algebra
   - libs/small-steps
   - libs/small-steps-test
-  - libs/non-integral
 
 - git: https://github.com/input-output-hk/cardano-node
-  commit: 2cbe363874d0261bc62f52185cf23ed492cf4859
+  commit: 814df2c146f5d56f8c35a681fe75e85b905aed5d
   subdirs:
   - cardano-api
 
@@ -111,7 +114,7 @@ packages:
   - tracer-transformers
 
 - git: https://github.com/input-output-hk/ouroboros-network
-  commit: 94782e5ca52f234ff8eeddc6322a46cca0b69c0e
+  commit: 32af91686b86dac7454eee8b8a8d6e97a80638da
   subdirs:
   - io-classes
   - io-sim
@@ -123,12 +126,14 @@ packages:
   - ouroboros-consensus-byronspec
   - ouroboros-consensus-byron-test
   - ouroboros-consensus-cardano
+  - ouroboros-consensus-protocol
   - ouroboros-consensus-shelley
   - ouroboros-consensus-shelley-test
   - ouroboros-consensus-cardano-test
   - ouroboros-network
   - ouroboros-network-framework
   - ouroboros-network-testing
+  - strict-stm
   - typed-protocols
   - typed-protocols-cborg
   - typed-protocols-examples