Upgrade server integration to Cardano v1.26.2

CardanoSolutions · May 11, 2021 · f2e86ac · f2e86ac
1 parent 70a3ab0
commit f2e86ac
Show file tree

Hide file tree

Showing 19 changed files with 282 additions and 163 deletions.
diff --git a/docs/static/ogmios.wsp.json b/docs/static/ogmios.wsp.json
@@ -2717,6 +2717,9 @@
         , { "$ref": "#/definitions/SubmitTxError[alreadyDelegating]" }
         , { "$ref": "#/definitions/SubmitTxError[insufficientFundsForMir]" }
         , { "$ref": "#/definitions/SubmitTxError[tooLateForMir]" }
+        , { "$ref": "#/definitions/SubmitTxError[mirTransferNotCurrentlyAllowed]" }
+        , { "$ref": "#/definitions/SubmitTxError[mirNegativeTransferNotCurrentlyAllowed]" }
+        , { "$ref": "#/definitions/SubmitTxError[mirProducesNegativeUpdate]" }
         , { "$ref": "#/definitions/SubmitTxError[duplicateGenesisVrf]" }
         , { "$ref": "#/definitions/SubmitTxError[nonGenesisVoters]" }
         , { "$ref": "#/definitions/SubmitTxError[updateWrongEpoch]" }
@@ -3221,6 +3224,24 @@
       }
     }
 
+  , "SubmitTxError[mirTransferNotCurrentlyAllowed]":
+    { "type": "string"
+    , "title": "mirTransferNotCurrentlyAllowed"
+    , "enum": [ "mirTransferNotCurrentlyAllowed" ]
+    }
+
+  , "SubmitTxError[mirNegativeTransferNotCurrentlyAllowed]":
+    { "type": "string"
+    , "title": "mirNegativeTransferNotCurrentlyAllowed"
+    , "enum": [ "mirNegativeTransferNotCurrentlyAllowed" ]
+    }
+
+  , "SubmitTxError[mirProducesNegativeUpdate]":
+    { "type": "string"
+    , "title": "mirProducesNegativeUpdate"
+    , "enum": [ "mirProducesNegativeUpdate" ]
+    }
+
   , "SubmitTxError[duplicateGenesisVrf]":
     { "type": "object"
     , "title": "duplicateGenesisVrf"

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "ae7be4559f30f924d0f0bedd7ae130113e3a995f",
-        "sha256": "1cc25hc5fhircxmrxrs7mjy4zm4mm7ibcynxdhj8ka8a9p5my8in",
+        "rev": "3b1fcfaca4217929f868100c517321bf46be55d9",
+        "sha256": "1z7q6995m2b309yr6n0nchhcmy8sc6615i1dc5xm26bp6p759xpy",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/ae7be4559f30f924d0f0bedd7ae130113e3a995f.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/3b1fcfaca4217929f868100c517321bf46be55d9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohkNix": {

diff --git a/server/.hpack.config.yaml b/server/.hpack.config.yaml
@@ -17,6 +17,7 @@ ghc-options:
     - -Wincomplete-uni-patterns
     - -Wpartial-fields
     - -Wredundant-constraints
+    - -Wunused-packages
 
   executable: &ghc-options-executable
     - -Wall                         # ^
@@ -25,7 +26,8 @@ ghc-options:
     - -Wincomplete-record-updates   # | Same as &ghc-options-lib
     - -Wincomplete-uni-patterns     # |
     - -Wpartial-fields              # |
-    - -Wredundant-constraints       # v
+    - -Wredundant-constraints       # |
+    - -Wunused-packages             # v
     - -threaded
     - -rtsopts
 
@@ -36,7 +38,8 @@ ghc-options:
     - -Wincomplete-record-updates   # | Same as &ghc-options-lib
     - -Wincomplete-uni-patterns     # |
     - -Wpartial-fields              # |
-    - -Wredundant-constraints       # v
+    - -Wredundant-constraints       # |
+    - -Wunused-packages             # v
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
diff --git a/server/cabal.project b/server/cabal.project
@@ -1,4 +1,4 @@
-index-state: 2021-01-10T00:00:00Z
+index-state: 2021-03-15T00:00:00Z
 
 packages:
   ./
@@ -35,8 +35,8 @@ package cardano-crypto-praos
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: b364d925e0a72689ecba40dd1f4899f76170b894
-  --sha256: 0igb4gnzlwxy1h40vy5s1aysmaa04wypxn7sn67qy6din7ysmad3
+  tag: 101e7752cf4b23fd0b411736f523b8f6c43f6bc2
+  --sha256: 04qnq9a3mhfqsisln2sygfm0xkkvj8f8hdzxm1qn2ss0mfsfzx8y
   subdir:
     binary
     binary/test
@@ -54,8 +54,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 097890495cbb0e8b62106bcd090a5721c3f4b36f
-  --sha256: 0i3y9n0rsyarvhfqzzzjccqnjgwb9fbmbs6b7vj40afjhimf5hcj
+  tag: 2e0e7b625492e5e0182464247f4c26d6949ab6f7
+  --sha256: 14affgsf0yl0y5mf9c5r9d9jvah2crrvcslq5cc2h4wii1agl07z
   subdir:
     byron/chain/executable-spec
     byron/crypto
@@ -73,9 +73,9 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/KtorZ/cardano-node
-  tag: 1777493c3b353f75ca796b78484d4b2da5ea5864
-  --sha256: 0qka3nikahavs36cjnv4mnps1s0wa1jb7pnb8rzrmkxm2x4cg27n
+  location: https://github.com/input-output-hk/cardano-node
+  tag: 3531289c9f79eab7ac5d3272ce6e6821504fec4c
+  --sha256: 17zr2lhnrly6gqb1hxf3cjwfw1iz8s85hhhdiivb5ax7fkrrp8pp
   subdir:
     cardano-api
     cardano-config
@@ -95,6 +95,12 @@ source-repository-package
   tag: cde90a2b27f79187ca8310b6549331e59595e7ba
   --sha256: 17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg
 
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/hedgehog-extras
+  tag: 8bcd3c9dc22cc44f9fcfe161f4638a384fc7a187
+  --sha256: 12viwpahjdfvlqpnzdgjp40nw31rvyznnab1hml9afpaxd6ixh70
+
 source-repository-package
   type: git
   location: https://github.com/KtorZ/hjsonpointer
@@ -110,8 +116,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 563e79f28c6da5c547463391d4c58a81442e48db
-  --sha256: 1is18h9kk8j16my89q76nihvapiiff3jl8777vk7c4wl2h4zry2w
+  tag: f6ab0631275d04dff1b990283bbf9671093e7505
+  --sha256: 0hknkpjmfgdlcag9p0z0xspxm7nxl696ajbnafi1b0vzxnkiyhdx
   subdir:
     contra-tracer
     iohk-monitoring
@@ -124,9 +130,9 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/KtorZ/ouroboros-network
-  tag: 7f8daad43dbb0ae97fe24d36eaff857f63cf5711
-  --sha256: 179046651gx6jh169fvdgmkd49gnib76rnjmp0ilnvg164bldzv9
+  location: https://github.com/input-output-hk/ouroboros-network
+  tag: 7f90c8c59ffc7d61a4e161e886d8962a9c26787a
+  --sha256: 0hnw6hvbyny3wniaqw8d37l4ysgp8xrq5d84fapxfm525a4hfs0x
   subdir:
     io-sim
     io-sim-classes
@@ -160,3 +166,4 @@ constraints:
   , libsystemd-journal >= 1.4.4
   , systemd >= 2.3.0
   , network >= 3.1.1.0
+  , relude == 0.7.0.0
diff --git a/server/modules/cardano-client/cardano-client.cabal b/server/modules/cardano-client/cardano-client.cabal
diff --git a/server/modules/cardano-client/package.yaml b/server/modules/cardano-client/package.yaml
@@ -26,7 +26,7 @@ library:
   ghc-options: *ghc-options-lib
   dependencies:
     - bytestring
-    - cardano-ledger
+    - cardano-ledger-byron
     - cborg
     - containers
     - contra-tracer

diff --git a/server/modules/fast-bech32/fast-bech32.cabal b/server/modules/fast-bech32/fast-bech32.cabal
diff --git a/server/modules/hspec-json-schema/hspec-json-schema.cabal b/server/modules/hspec-json-schema/hspec-json-schema.cabal
diff --git a/server/modules/hspec-json-schema/package.yaml b/server/modules/hspec-json-schema/package.yaml
@@ -31,7 +31,6 @@ library:
     - ansi-wl-pprint
     - hjsonschema
     - hjsonpointer
-    - hspec
     - QuickCheck
     - scientific
     - text

diff --git a/server/modules/json-via-show/json-via-show.cabal b/server/modules/json-via-show/json-via-show.cabal