WIP start integrating ledger-conway-1.9

Author: amesgen

cabal.project

@@ -31,3 +31,40 @@ tests: true
 benchmarks: true
 
 import: ./asserts.cabal
+
+-- TEMP
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: 83cdef1643efe86a55be91bab25b1c81db11a280
+  --sha256: 06h4a12p46k8qfizpjfjrg9hxvsqma4mq6k4apcndnx6wq8w3aiv
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-api
+    libs/cardano-ledger-core
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-pretty
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/small-steps-test
+    libs/cardano-data
+    libs/set-algebra
+    libs/vector-map
+    eras/byron/chain/executable-spec
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/byron/crypto
+    eras/byron/crypto/test

ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway

@@ -119,11 +119,11 @@ library
     , cardano-data
     , cardano-ledger-allegra
     , cardano-ledger-alonzo         ^>=1.4.1
-    , cardano-ledger-api            ^>=1.5
+    , cardano-ledger-api            ^>=1.6
     , cardano-ledger-babbage        ^>=1.4.4
     , cardano-ledger-binary
     , cardano-ledger-byron
-    , cardano-ledger-conway         ^>=1.8
+    , cardano-ledger-conway         ^>=1.9
     , cardano-ledger-core           ^>=1.6
     , cardano-ledger-mary
     , cardano-ledger-shelley        ^>=1.6

ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Conway

@@ -828,7 +828,7 @@ decodeShelleyResult v query = case query of
     GetGovState                                -> fromCBOR
     GetDRepState {}                            -> LC.fromEraCBOR @era
     GetDRepStakeDistr {}                       -> LC.fromEraCBOR @era
-    GetCommitteeState                          -> fromCBOR
+    GetCommitteeState                          -> LC.fromEraCBOR @era
 
 currentPParamsEnDecoding ::
      forall era s.

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -1,26 +1,41 @@
 {
-    "poolVotingThresholds": {
-        "pvtCommitteeNormal": 0,
-        "pvtCommitteeNoConfidence": 0,
-        "pvtHardForkInitiation": 0,
-        "pvtMotionNoConfidence": 0
-    },
-    "dRepVotingThresholds": {
-        "dvtCommitteeNormal": 0,
-        "dvtCommitteeNoConfidence": 0,
-        "dvtHardForkInitiation": 0,
-        "dvtMotionNoConfidence": 0,
-        "dvtPPEconomicGroup": 0,
-        "dvtPPGovGroup": 0,
-        "dvtPPNetworkGroup": 0,
-        "dvtPPTechnicalGroup": 0,
-        "dvtTreasuryWithdrawal": 0,
-        "dvtUpdateToConstitution": 0
-    },
-    "minCommitteeSize": 0,
-    "committeeTermLimit": 0,
-    "govActionExpiration": 0,
-    "govActionDeposit": 0,
-    "dRepDeposit": 0,
-    "dRepActivity": 0
+  "upgradeProtocolParams":{
+     "poolVotingThresholds":{
+        "pvtCommitteeNormal":0,
+        "pvtCommitteeNoConfidence":0,
+        "pvtHardForkInitiation":0,
+        "pvtMotionNoConfidence":0
+     },
+     "dRepVotingThresholds":{
+        "dvtMotionNoConfidence":0,
+        "dvtCommitteeNormal":0,
+        "dvtCommitteeNoConfidence":0,
+        "dvtUpdateToConstitution":0,
+        "dvtHardForkInitiation":0,
+        "dvtPPNetworkGroup":0,
+        "dvtPPEconomicGroup":0,
+        "dvtPPTechnicalGroup":0,
+        "dvtPPGovGroup":0,
+        "dvtTreasuryWithdrawal":0
+     },
+     "minCommitteeSize":0,
+     "committeeTermLimit":0,
+     "govActionExpiration":0,
+     "govActionDeposit":0,
+     "dRepDeposit":0,
+     "dRepActivity":0
+  },
+  "constitution": {
+    "anchor": {
+      "url": "",
+      "dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
+    }
+  },
+  "committee" :{
+    "members" : {
+       "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1 ,
+       "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
+     },
+    "quorum": 0.5
+  }
 }