bump Cardano dependencies to match cardano-node@1.27.0

CardanoSolutions · May 13, 2021 · e553c56 · e553c56
1 parent dee76e9
commit e553c56
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 76 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,9 +9,9 @@ pre: "<b>5. </b>"
 
 #### Added
 
-- Integrated with the Cardano eco-system corresponding to cardano-node@1.26.2. Bumped the docker-compose installation accordingly.
+- Integrated with the Cardano eco-system corresponding to cardano-node@1.27.0. Bumped the docker-compose installation accordingly.
 
-- Three new possible errors from the transaction submission coming with cardano-node@1.26.2:
+- Three new possible errors from the transaction submission coming with cardano-node@1.27.0:
 
   - `mirTransferNotCurrentlyAllowed`
   - `mirNegativeTransferNotCurrentlyAllowed`
@@ -25,6 +25,9 @@ pre: "<b>5. </b>"
 - The `moveInstantaneousRewards` certificates have a new optional field `value` and not only a `rewards` map as before. 
   When `value` is present, it signifies that rewards are moved to the other pot. 
 
+- The 'networkMismatch` error can now also be related to a mismatch from the network and the reward account coming from a 
+  pool registration certificate. 
+
 #### Removed
 
 ø

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.5"
 
 services:
   cardano-node:
-    image: inputoutput/cardano-node:1.26.2
+    image: inputoutput/cardano-node:1.27.0
     restart: on-failure
     environment:
       - NETWORK=${NETWORK:-mainnet}

diff --git a/docs/static/ogmios.wsp.json b/docs/static/ogmios.wsp.json
@@ -2968,20 +2968,33 @@
     , "required": [ "networkMismatch" ]
     , "properties":
       { "networkMismatch":
-        { "type": "object"
-        , "additionalProperties": false
-        , "required": [ "expectedNetwork" ]
-        , "properties":
-          { "expectedNetwork": { "$ref": "#/definitions/Network" }
-          , "invalidAddresses":
-            { "type": "array"
-            , "items": { "$ref": "#/definitions/Address" }
+        { "oneOf":
+          [ { "type": "object"
+            , "title": "In address"
+            , "additionalProperties": false
+            , "required": [ "expectedNetwork" ]
+            , "properties":
+              { "expectedNetwork": { "$ref": "#/definitions/Network" }
+              , "invalidAddresses":
+                { "type": "array"
+                , "items": { "$ref": "#/definitions/Address" }
+                }
+              , "invalidRewardAccounts":
+                { "type": "array"
+                , "items": { "$ref": "#/definitions/RewardAccount" }
+                }
+              }
             }
-          , "invalidRewardAccounts":
-            { "type": "array"
-            , "items": { "$ref": "#/definitions/RewardAccount" }
+          , { "type": "object"
+            , "title": "In pool certificate"
+            , "additionalProperties": false
+            , "required": [ "expectedNetwork", "invalidPoolRegistration" ]
+            , "properties":
+              { "expectedNetwork": { "$ref": "#/definitions/Network" }
+              , "invalidPoolRegistration": { "$ref": "#/definitions/PoolId" }
+              }
             }
-          }
+          ]
         }
       }
     }

diff --git a/server/cabal.project b/server/cabal.project
@@ -35,15 +35,16 @@ package cardano-crypto-praos
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 101e7752cf4b23fd0b411736f523b8f6c43f6bc2
-  --sha256: 04qnq9a3mhfqsisln2sygfm0xkkvj8f8hdzxm1qn2ss0mfsfzx8y
+  tag: 47db5b818ca4fa051f2e44cdf5e7c5c18c1fb0bf
+  --sha256: 0fr0r5dwfmsp15j19xh20js8nzsqyhwx4q797rxsvpyjfabb2y11
   subdir:
     binary
     binary/test
     cardano-crypto-class
     cardano-crypto-praos
     cardano-crypto-tests
     slotting
+    strict-containers
 
 source-repository-package
   type: git
@@ -54,15 +55,16 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 2e0e7b625492e5e0182464247f4c26d6949ab6f7
-  --sha256: 14affgsf0yl0y5mf9c5r9d9jvah2crrvcslq5cc2h4wii1agl07z
+  tag: e8f19bcc9c8f405131cb95ca6ada26b2b4eac638
+  --sha256: 1v36d3lyhmadzj0abdfsppjna7n7llzqzp9ikx5yq28l2kda2f1p
   subdir:
     byron/chain/executable-spec
     byron/crypto
     byron/crypto/test
     byron/ledger/executable-spec
     byron/ledger/impl
     byron/ledger/impl/test
+    cardano-ledger-core
     semantics/executable-spec
     semantics/small-steps-test
     shelley/chain-and-ledger/dependencies/non-integer
@@ -74,17 +76,17 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 3531289c9f79eab7ac5d3272ce6e6821504fec4c
-  --sha256: 17zr2lhnrly6gqb1hxf3cjwfw1iz8s85hhhdiivb5ax7fkrrp8pp
+  tag: 8fe46140a52810b6ca456be01d652ca08fe730bf
+  --sha256: 1c9zc899wlgicrs49i33l0bwb554acsavzh1vcyhnxmpm0dmy8vj
   subdir:
     cardano-api
     cardano-config
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: ee4e7b547a991876e6b05ba542f4e62909f4a571
-  --sha256: 0dg6ihgrn5mgqp95c4f11l6kh9k3y75lwfqf47hdp554w7wyvaw6
+  tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
+  --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
   subdir:
     cardano-prelude
     cardano-prelude-test
@@ -116,8 +118,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: f6ab0631275d04dff1b990283bbf9671093e7505
-  --sha256: 0hknkpjmfgdlcag9p0z0xspxm7nxl696ajbnafi1b0vzxnkiyhdx
+  tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
+  --sha256: 0298dpl29gxzs9as9ha6y0w18hqwc00ipa3hzkxv7nlfrjjz8hmz
   subdir:
     contra-tracer
     iohk-monitoring
@@ -131,8 +133,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7f90c8c59ffc7d61a4e161e886d8962a9c26787a
-  --sha256: 0hnw6hvbyny3wniaqw8d37l4ysgp8xrq5d84fapxfm525a4hfs0x
+  tag: 9b279c7548ee549e1ed755cd1acb69b6e69d0c7b
+  --sha256: 0d7bk9vzmhhb2z4ns2qw7f1vz6lr186m98sh8wvrnfpxk3z86dxb
   subdir:
     io-sim
     io-sim-classes
@@ -152,14 +154,19 @@ source-repository-package
     ouroboros-network-testing
     typed-protocols
     typed-protocols-examples
-    Win32-network
 
 source-repository-package
   type: git
   location: https://github.com/KtorZ/wai-routes
   tag: d74b39683792649c01113f40bf57724dcf95c96a
   --sha256: 117gkhcq2spmphp21nx8am6mk80wha1yvsny9y0hlkv381jjavii
 
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/Win32-network
+  tag: 94153b676617f8f33abe8d8182c37377d2784bd1
+  --sha256: 0pb7bg0936fldaa5r08nqbxvi2g8pcy4w3c7kdcg7pdgmimr30ss
+
 constraints:
     hedgehog >= 1.0
   , bimap >= 0.4.0

diff --git a/server/ogmios.cabal b/server/ogmios.cabal
diff --git a/server/package.yaml b/server/package.yaml
@@ -53,8 +53,8 @@ library:
     - cardano-crypto-class
     - cardano-crypto-wrapper
     - cardano-ledger-byron
+    - cardano-ledger-core
     - cardano-ledger-shelley-ma
-    - cardano-prelude
     - cardano-slotting
     - cborg
     - containers
@@ -85,6 +85,7 @@ library:
     - scientific
     - shelley-spec-ledger
     - small-steps
+    - strict-containers
     - text
     - time
     - time-manager

diff --git a/server/resolver.yaml b/server/resolver.yaml
@@ -37,43 +37,45 @@ packages:
 - Win32-2.6.2.0
 
 - git: https://github.com/input-output-hk/cardano-base
-  commit: 101e7752cf4b23fd0b411736f523b8f6c43f6bc2
+  commit: 47db5b818ca4fa051f2e44cdf5e7c5c18c1fb0bf
   subdirs:
   - binary
   - binary/test
   - cardano-crypto-class
   - cardano-crypto-tests
   - cardano-crypto-praos
   - slotting
+  - strict-containers
 
 - git: https://github.com/input-output-hk/cardano-crypto
   commit: f73079303f663e028288f9f4a9e08bcca39a923e
 
 - git: https://github.com/input-output-hk/cardano-ledger-specs
-  commit: 2e0e7b625492e5e0182464247f4c26d6949ab6f7
+  commit: e8f19bcc9c8f405131cb95ca6ada26b2b4eac638
   subdirs:
   - byron/chain/executable-spec
   - byron/crypto
   - byron/crypto/test
   - byron/ledger/executable-spec
   - byron/ledger/impl
   - byron/ledger/impl/test
+  - cardano-ledger-core
   - semantics/executable-spec
   - semantics/small-steps-test
-  - shelley-ma/impl
-  - shelley-ma/shelley-ma-test
   - shelley/chain-and-ledger/dependencies/non-integer
   - shelley/chain-and-ledger/executable-spec
   - shelley/chain-and-ledger/shelley-spec-ledger-test
+  - shelley-ma/impl
+  - shelley-ma/shelley-ma-test
 
 - git: https://github.com/input-output-hk/cardano-node
-  commit: 3531289c9f79eab7ac5d3272ce6e6821504fec4c
+  commit: 8fe46140a52810b6ca456be01d652ca08fe730bf
   subdirs:
     - cardano-api
     - cardano-config
 
 - git: https://github.com/input-output-hk/cardano-prelude
-  commit: ee4e7b547a991876e6b05ba542f4e62909f4a571
+  commit: bb4ed71ba8e587f672d06edf9d2e376f4b055555
   subdirs:
   - cardano-prelude
   - cardano-prelude-test
@@ -91,7 +93,7 @@ packages:
   commit: fde6e676f79f3f3320a558f20492ad816a2543a7
 
 - git: https://github.com/input-output-hk/iohk-monitoring-framework
-  commit: f6ab0631275d04dff1b990283bbf9671093e7505
+  commit: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
   subdirs:
   - contra-tracer
   - iohk-monitoring
@@ -103,7 +105,7 @@ packages:
   - tracer-transformers
 
 - git: https://github.com/input-output-hk/ouroboros-network
-  commit: 7f90c8c59ffc7d61a4e161e886d8962a9c26787a
+  commit: 9b279c7548ee549e1ed755cd1acb69b6e69d0c7b
   subdirs:
     - io-sim
     - io-sim-classes
@@ -119,9 +121,12 @@ packages:
     - ouroboros-consensus-cardano-test
     - ouroboros-network
     - ouroboros-network-framework
+    - ouroboros-network-testing
     - typed-protocols
     - typed-protocols-examples
-    - Win32-network
 
 - git: https://github.com/KtorZ/wai-routes
   commit: d74b39683792649c01113f40bf57724dcf95c96a
+
+- git: https://github.com/input-output-hk/Win32-network
+  commit: 94153b676617f8f33abe8d8182c37377d2784bd1
diff --git a/server/src/Ogmios/Data/Json/Allegra.hs b/server/src/Ogmios/Data/Json/Allegra.hs
@@ -31,7 +31,6 @@ import qualified Cardano.Ledger.ShelleyMA.TxBody as MA
 import qualified Shelley.Spec.Ledger.BlockChain as Sh
 import qualified Shelley.Spec.Ledger.PParams as Sh
 import qualified Shelley.Spec.Ledger.STS.Ledger as Sh
-import qualified Shelley.Spec.Ledger.STS.Ledgers as Sh
 import qualified Shelley.Spec.Ledger.Tx as Sh
 import qualified Shelley.Spec.Ledger.UTxO as Sh
 
@@ -72,12 +71,12 @@ encodeAuxiliaryData (MA.AuxiliaryData blob scripts) = encodeObject
 
 encodeLedgerFailure
     :: Crypto crypto
-    => Sh.LedgersPredicateFailure (AllegraEra crypto)
+    => Sh.LedgerPredicateFailure (AllegraEra crypto)
     -> Json
 encodeLedgerFailure = \case
-    Sh.LedgerFailure (Sh.UtxowFailure e)  ->
+    Sh.UtxowFailure e  ->
         Shelley.encodeUtxowFailure encodeUtxoFailure e
-    Sh.LedgerFailure (Sh.DelegsFailure e) ->
+    Sh.DelegsFailure e ->
         Shelley.encodeDelegsFailure e
 
 encodePParams'
@@ -119,23 +118,23 @@ encodeTx
     -> Json
 encodeTx mode x = encodeObjectWithMode mode
     [ ( "id"
-      , Shelley.encodeTxId (Sh.txid @(AllegraEra crypto) (Sh._body x))
+      , Shelley.encodeTxId (Sh.txid @(AllegraEra crypto) (Sh.body x))
       )
     , ( "body"
-      , encodeTxBody (Sh._body x)
+      , encodeTxBody (Sh.body x)
       )
     , ( "metadata", encodeObject
         [ ( "hash"
-          , encodeStrictMaybe Shelley.encodeAuxiliaryDataHash (adHash (Sh._body x))
+          , encodeStrictMaybe Shelley.encodeAuxiliaryDataHash (adHash (Sh.body x))
           )
         , ( "body"
-          , encodeStrictMaybe encodeAuxiliaryData (Sh._metadata x)
+          , encodeStrictMaybe encodeAuxiliaryData (Sh.auxiliaryData x)
           )
         ]
       )
     ]
     [ ( "witness"
-      , encodeWitnessSet (Sh._witnessSet x)
+      , encodeWitnessSet (Sh.wits x)
       )
     ]
   where