Update for cardano-api#945

Author: carbolymer

cardano-testnet/src/Parsers/Cardano.hs

@@ -10,9 +10,9 @@ import           Cardano.Api (AnyShelleyBasedEra (..))
 import           Cardano.Api (AnyShelleyBasedEra(..))
 import           Cardano.CLI.EraBased.Common.Option (bounded, command')
 import           Cardano.Api (AnyShelleyBasedEra (..), EraInEon (..), prettyShow)
+import           Cardano.Api.Era (AnyShelleyBasedEra (..))
+import           Cardano.Api.Pretty
 
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Common.Option (bounded, command')
 import           Cardano.CLI.EraBased.Common.Option hiding (pNetworkId)
 
 import           Prelude
@@ -84,10 +84,6 @@ pCardanoTestnetCliOptions = CardanoTestnetOptions
       <>  OA.help "[EXPERIMENTAL] Enable gRPC endpoint on all of testnet nodes. The listening socket file will be the same directory as node's N2C socket."
       <>  OA.showDefault
       )
-  where
-    pAnyShelleyBasedEra' :: Parser AnyShelleyBasedEra
-    pAnyShelleyBasedEra' =
-      pAnyShelleyBasedEra envCli <&> (\(EraInEon x) -> AnyShelleyBasedEra x)
 
 pTestnetNodeOptions :: Parser [NodeOption]
 pTestnetNodeOptions =

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Rpc/Query.hs

@@ -129,6 +129,7 @@ hprop_rpc_query_pparams = integrationRetryWorkspace 2 "rpc-query-pparams" $ \tem
     M.lookup L.PlutusV1 pparamsCostModels === chainParams ^. #costModels . #plutusV1 . #values . to Just
     M.lookup L.PlutusV2 pparamsCostModels === chainParams ^. #costModels . #plutusV2 . #values . to Just
     M.lookup L.PlutusV3 pparamsCostModels === chainParams ^. #costModels . #plutusV3 . #values . to Just
+    M.lookup L.PlutusV4 pparamsCostModels === chainParams ^. #costModels . #plutusV4 . #values . to Just
     pparams ^. L.ppPricesL . to L.prSteps . to L.unboundRational === chainParams ^. #prices . #steps . to inject
     pparams ^. L.ppPricesL . to L.prMem . to L.unboundRational === chainParams ^. #prices . #memory . to inject
     pparams ^. L.ppMaxTxExUnitsL === chainParams ^. #maxExecutionUnitsPerTransaction . to inject

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Rpc/Transaction.hs

@@ -82,7 +82,7 @@ hprop_rpc_transaction = integrationRetryWorkspace 2 "rpc-tx" $ \tempAbsBasePath'
       Rpc.nonStreaming conn (Rpc.rpc @(Rpc.Protobuf UtxoRpc.QueryService "readParams")) req
 
     utxos' <- do
-      let req = def & #addresses . #items .~ [T.encodeUtf8 addrTxt0]
+      let req = def & #cardanoAddresses . #items .~ [T.encodeUtf8 addrTxt0]
       Rpc.nonStreaming conn (Rpc.rpc @(Rpc.Protobuf UtxoRpc.QueryService "readUtxos")) req
     pure (pparams', utxos')
 
@@ -128,7 +128,7 @@ hprop_rpc_transaction = integrationRetryWorkspace 2 "rpc-tx" $ \tempAbsBasePath'
 
     utxos <-
       Rpc.nonStreaming conn (Rpc.rpc @(Rpc.Protobuf UtxoRpc.QueryService "readUtxos")) $
-        def & #addresses . #items .~ [T.encodeUtf8 addrTxt1]
+        def & #cardanoAddresses . #items .~ [T.encodeUtf8 addrTxt1]
     pure (utxos, submitResponse)
 
   submittedTxIds <- forM (submitResponse ^. #results) $ \res -> do