[ADP-3420] Bump to node 9.1.1 constraints (#4763)

- bump runtime node dependency to 9.1.1
- bump ouroboros-consensus dependency to 0.18
-  accommodate code and golden tests for the bump

ADP-3420

Author: paolino

cabal.project

@@ -54,7 +54,7 @@ index-state: 2024-08-08T00:00:00Z
 
 index-state:
   , hackage.haskell.org 2024-08-08T00:00:00Z
-  , cardano-haskell-packages 2024-06-29T00:00:00Z
+  , cardano-haskell-packages 2024-09-01T03:50:08Z
 
 packages:
   lib/address-derivation-discovery
@@ -157,8 +157,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/cardano-foundation/cardano-wallet-agda
-    tag: 525eb93be15a8c1ea6198e472f401ea0f9a985cd
-    --sha256: 1mw98kdqhafdq89ry3yxwd1xwjd7g69fs5pd1p2np8sdrpxh3n8g
+    tag: 552c184523a815931b96f55292a54aab8aa8bde3
+    --sha256: 1a241r0xd2102kvyanlpb5xyrn22i3f9vzx9667l5xik9qgrjzxv
     subdir:
       lib/customer-deposit-wallet-pure
       lib/cardano-wallet-read
@@ -186,7 +186,8 @@ constraints:
   -- Cardano Node dependencies:
   , io-classes >= 1.4
   , io-classes -asserts
-  , ouroboros-consensus-cardano ^>= 0.17
+
+  , ouroboros-consensus-cardano ^>= 0.18
   , ouroboros-network ^>= 0.16.1
   , ouroboros-network-protocols ^>= 0.9
 

flake.lock

@@ -142,7 +142,7 @@
       flake = false;
     };
     customConfig.url = "github:input-output-hk/empty-flake";
-    cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=9.1.0";
+    cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=9.1.1";
   };
 
   outputs = { self, nixpkgs, nixpkgs-unstable, hostNixpkgs, flake-utils,

flake.nix

@@ -410,9 +410,10 @@ instance IsRecentEra ConwayEra where
 cardanoEraFromRecentEra
     :: RecentEra era
     -> CardanoApi.CardanoEra (CardanoApiEra era)
-cardanoEraFromRecentEra =
-    CardanoApi.shelleyBasedToCardanoEra
-    . shelleyBasedEraFromRecentEra
+cardanoEraFromRecentEra era = case shelleyBasedEraFromRecentEra era of
+    CardanoApi.ShelleyBasedEraBabbage -> CardanoApi.toCardanoEra CardanoApi.BabbageEra
+    CardanoApi.ShelleyBasedEraConway -> CardanoApi.toCardanoEra CardanoApi.ConwayEra
+    _ -> error "we are expecting only Babbage and Conway"
 
 shelleyBasedEraFromRecentEra
     :: RecentEra era

lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs

@@ -1012,7 +1012,7 @@ genScriptWitnessSpend langEra =
         (PlutusScriptLanguage ver) ->
             PlutusScriptWitness langEra ver
                 <$> genPlutusScriptOrReferenceInput ver
-                <*> (ScriptDatumForTxIn <$> genHashableScriptData)
+                <*> (ScriptDatumForTxIn . Just <$> genHashableScriptData)
                 <*> genHashableScriptData
                 <*> genExecutionUnits
 
@@ -1604,7 +1604,7 @@ genTxCertificates era = withEraWitness era $ \sbe ->
         [ pure TxCertificatesNone
         , TxCertificates sbe
             <$> scale (`div` 3) (listOf (genTxCertificate era))
-            <*> ( (BuildTxWith . Map.fromList)
+            <*> ( BuildTxWith
                     <$> scale
                         (`div` 3)
                         ( listOf
@@ -1780,7 +1780,7 @@ genTxBodyContent era = withEraWitness era $ \sbe -> do
     txValidityUpperBound <- genTxValidityUpperBound era
     txProposalProcedures <- genMaybeFeaturedInEra genProposals era
     txVotingProcedures <- genMaybeFeaturedInEra genVotingProcedures era
-    txCurrentTreasuryValue <- genMaybeFeaturedInEra (const genCoin) era
+    txCurrentTreasuryValue <- genMaybeFeaturedInEra (const (pure <$> genCoin)) era
     txTreasuryDonation <- genMaybeFeaturedInEra (const genCoin) era
 
     let

lib/balance-tx/test/data/balanceTx/pingPong_2/golden

@@ -98,8 +98,8 @@ spendTxD tx !u =
   where
     inputsToExclude =
         case Tx.getScriptValidity tx of
-            Tx.IsValid True -> Tx.getInputs tx
-            Tx.IsValid False -> Tx.getCollateralInputs tx
+            Tx.IsValidC True -> Tx.getInputs tx
+            Tx.IsValidC False -> Tx.getCollateralInputs tx
 
 {-----------------------------------------------------------------------------
     Helpers

lib/cardano-api-extra/lib/Cardano/Api/Gen.hs

@@ -67,7 +67,7 @@ test-suite test
     , bytestring
     , cardano-wallet-secrets
     , cardano-wallet-test-utils
-    , hspec >= 2.8.2
+    , hspec
     , memory
     , text
     , text-class

lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure/Balance.hs

@@ -892,8 +892,8 @@ mkUnsignedTx
     , Cardano.txCertificates = case stakingScriptM of
         Nothing ->
             let
-                witMap = Map.empty
-                ctx = Cardano.BuildTxWith witMap
+                witPair = []
+                ctx = Cardano.BuildTxWith witPair
             in
                 Cardano.TxCertificates shelleyEra certs ctx
         Just stakingScript ->
@@ -907,8 +907,8 @@ mkUnsignedTx
                     Cardano.ScriptWitness
                         Cardano.ScriptWitnessForStakeAddr
                         (toScriptWitness stakingScript)
-                witMap = Map.fromList [(buildKey, buildVal)]
-                ctx = Cardano.BuildTxWith witMap
+                witPair = [(buildKey, buildVal)]
+                ctx = Cardano.BuildTxWith witPair
             in
             Cardano.TxCertificates shelleyEra certs ctx