Rebase changes

Author: Jimbo4350

cabal.project

@@ -60,7 +60,6 @@ package plutus-scripts-bench
 
 allow-newer:
   , katip:Win32
-  , hedgehog-extras
 
 if impl (ghc >= 9.12)
   allow-newer:

cardano-testnet/cardano-testnet.cabal

@@ -103,7 +103,6 @@ library
                       , transformers
                       , transformers-except
                       , unliftio
-                      , vector
                       , yaml
 
   hs-source-dirs:       src

cardano-testnet/src/Testnet/Components/Configuration.hs

@@ -29,14 +29,7 @@ import qualified Cardano.Crypto.Hash.Blake2b as Crypto
 import qualified Cardano.Crypto.Hash.Class as Crypto
 import           Cardano.Ledger.BaseTypes (unsafeNonZero)
 import           Cardano.Ledger.Dijkstra.Genesis (DijkstraGenesis)
-import           Cardano.Network.PeerSelection.Bootstrap
-import           Cardano.Network.PeerSelection.PeerTrustable
-import qualified Cardano.Node.Configuration.Topology as NonP2P
-import qualified Cardano.Node.Configuration.TopologyP2P as P2P
 import           Cardano.Node.Protocol.Byron
-import           Ouroboros.Network.NodeToNode (DiffusionMode (..))
-import           Ouroboros.Network.PeerSelection.LedgerPeers
-import           Ouroboros.Network.PeerSelection.State.LocalRootPeers
 
 import           Control.Exception
 import           Control.Monad
@@ -47,6 +40,7 @@ import qualified Data.Aeson.Encode.Pretty as A
 import           Data.Aeson.Key hiding (fromString)
 import           Data.Aeson.KeyMap hiding (map)
 import qualified Data.ByteString as BS
+import qualified Data.ByteString.Lazy as LBS
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Time.Clock as DTC
@@ -146,10 +140,9 @@ getDefaultShelleyGenesis asbe maxSupply opts = do
 getDefaultAlonzoGenesis :: ()
   => HasCallStack
   => MonadThrow m
-  => ShelleyBasedEra era
-  -> m AlonzoGenesis
-getDefaultAlonzoGenesis sbe =
-  case Defaults.defaultAlonzoGenesis sbe of 
+  => m AlonzoGenesis
+getDefaultAlonzoGenesis =
+  case Defaults.defaultAlonzoGenesis of 
     Right genesis -> return genesis
     Left err -> throwM err
 
@@ -191,16 +184,16 @@ createSPOGenesisAndFiles
   let conwayGenesis' = Defaults.defaultConwayGenesis
       dijkstraGenesis' = dijkstraGenesisDefaults
 
-  (alonzoGenesis, conwayGenesis, shelleyGenesis)   
+  (shelleyGenesis, alonzoGenesis, conwayGenesis, dijkstraGenesis)   
      <- resolveOnChainParams onChainParams
-     (alonzoGenesis', conwayGenesis', shelleyGenesis')
+     (shelleyGenesis', alonzoGenesis', conwayGenesis', dijkstraGenesis')
 
   -- Write Genesis files to disk, so they can be picked up by create-testnet-data
   liftIOAnnotated $ do
     LBS.writeFile inputGenesisAlonzoFp $ A.encodePretty alonzoGenesis
     LBS.writeFile inputGenesisConwayFp $ A.encodePretty conwayGenesis
     LBS.writeFile inputGenesisShelleyFp $ A.encodePretty shelleyGenesis
-
+    LBS.writeFile inputGenesisDijkstraFp $ A.encodePretty dijkstraGenesis
   let era = toCardanoEra sbe
 
   currentTime <- liftIOAnnotated DTC.getCurrentTime
@@ -244,51 +237,6 @@ createSPOGenesisAndFiles
     createTestnetDataFlag sbe =
         ["--spec-" ++ eraToString sbe, genesisInputFilepath sbe]
 
-ifaceAddress :: String
-ifaceAddress = "127.0.0.1"
-
--- TODO: Reconcile all other mkTopologyConfig functions. NB: We only intend
--- to support current era on mainnet and the upcoming era.
-mkTopologyConfig :: Int -> [Int] -> Int -> Bool -> LBS.ByteString
-mkTopologyConfig numNodes allPorts port False = A.encodePretty topologyNonP2P
-  where
-    topologyNonP2P :: NonP2P.NetworkTopology NonP2P.RemoteAddress
-    topologyNonP2P =
-      NonP2P.RealNodeTopology
-        [ NonP2P.RemoteAddress (fromString ifaceAddress)
-                               (fromIntegral peerPort)
-                               (numNodes - 1)
-        | peerPort <- allPorts List.\\ [port]
-        ]
-mkTopologyConfig numNodes allPorts port True = A.encodePretty topologyP2P
-  where
-    rootConfig :: P2P.RootConfig RelayAccessPoint
-    rootConfig =
-      P2P.RootConfig
-        [ RelayAccessAddress (fromString ifaceAddress)
-                             (fromIntegral peerPort)
-        | peerPort <- allPorts List.\\ [port]
-        ]
-        P2P.DoNotAdvertisePeer
-
-    localRootPeerGroups :: P2P.LocalRootPeersGroups RelayAccessPoint
-    localRootPeerGroups =
-      P2P.LocalRootPeersGroups
-        [ P2P.LocalRootPeersGroup rootConfig
-                                  (HotValency (numNodes - 1))
-                                  (WarmValency (numNodes - 1))
-                                  IsNotTrustable
-                                  InitiatorAndResponderDiffusionMode
-        ]
-
-    topologyP2P :: P2P.NetworkTopology RelayAccessPoint
-    topologyP2P =
-      P2P.RealNodeTopology
-        localRootPeerGroups
-        []
-        DontUseLedgerPeers
-        DontUseBootstrapPeers
-        Nothing
 
 
 data BlockfrostParamsError = BlockfrostParamsDecodeError FilePath String

cardano-testnet/src/Testnet/Defaults.hs

@@ -112,9 +112,9 @@ instance Exception AlonzoGenesisError where
   displayException = Api.docToString . Api.prettyError
 
 
-defaultAlonzoGenesis :: ShelleyBasedEra era -> Either AlonzoGenesisError AlonzoGenesis
-defaultAlonzoGenesis sbe = do
-  let genesis = Api.alonzoGenesisDefaults (toCardanoEra sbe)
+defaultAlonzoGenesis :: Either AlonzoGenesisError AlonzoGenesis
+defaultAlonzoGenesis = do
+  let genesis = Api.alonzoGenesisDefaults  
       prices = Ledger.agPrices genesis
 
   -- double check that prices have correct values - they're set using unsafeBoundedRational in cardano-api

cardano-testnet/src/Testnet/Process/RunIO.hs

@@ -241,10 +241,13 @@ binDist pkg binaryEnv = do
               <> binaryEnv
               <> " and have it point to the executable you want."
 
-  Plan{installPlan} <- eitherDecode <$> liftIOAnnotated (LBS.readFile planJsonFile)
-      >>= \case
-        Left message -> error $ "Cannot decode plan in " <> planJsonFile <> ": " <> message
-        Right plan -> pure plan
+  Plan{installPlan} <- liftIOAnnotated (LBS.readFile planJsonFile)  >>=
+                         (\case
+                            Left message
+                              -> error
+                                   $ "Cannot decode plan in " <> planJsonFile <> ": " <> message
+                            Right plan -> pure plan)
+                           . eitherDecode
 
   let componentName = "exe:" <> fromString pkg
   case findComponent componentName installPlan of

cardano-testnet/src/Testnet/Start/Cardano.hs

@@ -33,8 +33,6 @@ import           Cardano.Api
 import           Cardano.Api.Byron (GenesisData (..))
 import qualified Cardano.Api.Byron as Byron
 
-import           Cardano.Node.Configuration.Topology (RemoteAddress (..))
-import qualified Cardano.Node.Configuration.Topology as Direct
 import qualified Cardano.Node.Configuration.TopologyP2P as P2P
 import           Cardano.Prelude (canonicalEncodePretty)
 import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
@@ -133,11 +131,6 @@ createTestnetEnv
   config <- case genesisHashesPolicy of
     WithHashes -> createConfigJson (TmpAbsolutePath tmpAbsPath) sbe
     WithoutHashes -> pure $ createConfigJsonNoHash sbe
-  -- Setup P2P configuration value
-  let config = A.insert
-        "EnableP2P"
-        (Bool $ topologyType == P2PTopology)
-        config'
 
   liftIOAnnotated . LBS.writeFile configurationFile $ A.encodePretty $ Object config
 
@@ -148,13 +141,8 @@ createTestnetEnv
     liftIOAnnotated $ IO.createDirectoryIfMissing True nodeDataDir
 
     let producers = NodeId <$> filter (/= i) nodeIds
-    case topologyType of
-      DirectTopology ->
-        let topology = Direct.RealNodeTopology producers
-        in liftIOAnnotated . LBS.writeFile (nodeDataDir </> "topology.json") $ A.encodePretty topology
-      P2PTopology ->
-        let topology = Defaults.defaultP2PTopology producers
-        in liftIOAnnotated . LBS.writeFile (nodeDataDir </> "topology.json") $ A.encodePretty topology
+        topology = Defaults.defaultP2PTopology producers
+    liftIOAnnotated . LBS.writeFile  (nodeDataDir </> "topology.json") $ A.encodePretty topology
 
 -- | Starts a number of nodes, as configured by the value of the 'cardanoNodes'
 -- field in the 'CardanoTestnetOptions' argument. Regarding this field, you can either:
@@ -277,24 +265,6 @@ cardanoTestnet
 
   let portNumbers = zip [1..] $ snd <$> portNumbersWithNodeOptions
 
-  forM_ portNumbers $ \(i, portNumber) -> do
-    let nodeDataDir = tmpAbsPath </> Defaults.defaultNodeDataDir i
-    liftIOAnnotated $ IO.createDirectoryIfMissing True nodeDataDir
-    liftIOAnnotated $ writeFile (nodeDataDir </> "port") (show portNumber)
-
-  let
-      idToRemoteAddressDirect :: ()
-        => HasCallStack
-        => MonadIO m
-        => NodeId -> m RemoteAddress
-      idToRemoteAddressDirect (NodeId i) = case lookup i portNumbers of
-        Just port -> pure $ RemoteAddress
-          { raAddress = showIpv4Address testnetDefaultIpv4Address
-          , raPort = port
-          , raValency = 1
-          }
-        Nothing -> do
-          throwString $ "Found node id that was unaccounted for: " ++ show i
       idToRemoteAddressP2P :: ()
         => MonadIO m
         => HasCallStack
@@ -306,27 +276,21 @@ cardanoTestnet
         Nothing -> do
           throwString $ "Found node id that was unaccounted for: " ++ show i
 
-  -- Implement concrete topology from abstract one, if necessary
-  forM_ portNumbers $ \(i, _port) -> do
+  forM_ portNumbers $ \(i, portNumber) -> do
+    let nodeDataDir = tmpAbsPath </> Defaults.defaultNodeDataDir i
+    liftIOAnnotated $ IO.createDirectoryIfMissing True nodeDataDir
+    liftIOAnnotated $ writeFile (nodeDataDir </> "port") (show portNumber)
     let topologyPath = tmpAbsPath </> Defaults.defaultNodeDataDir i </> "topology.json"
-
-    -- Try to decode either a direct topology file, or a P2P one
     tBytes <- liftIOAnnotated $ LBS.readFile topologyPath
-    case eitherDecode tBytes of
-      Right (abstractTopology :: Direct.NetworkTopology NodeId) -> do
-        topology <- mapM idToRemoteAddressDirect abstractTopology
-        liftIOAnnotated . LBS.writeFile topologyPath $ encode topology
-      Left _ ->
-        case eitherDecode tBytes of
-          Right (abstractTopology :: P2P.NetworkTopology NodeId) -> do
-            topology <- mapM idToRemoteAddressP2P abstractTopology
-            liftIOAnnotated . LBS.writeFile topologyPath $ encode topology
-          Left e ->
-            -- There can be multiple reasons for why both decodings have failed.
-            -- Here we assume, very optimistically, that the user has already
-            -- instantiated it with a concrete topology file.
-            -- TODO: It is suspicious that this decoding can fail. Investigate further.
-            liftIOAnnotated . putStrLn $ "Could not decode topology file: " <> topologyPath <> ". This may be okay. Reason for decoding failure is:\n" ++ e
+    case eitherDecode tBytes of 
+      Right (abstractTopology :: P2P.NetworkTopology NodeId) -> do
+        topology <- mapM idToRemoteAddressP2P abstractTopology
+        liftIOAnnotated $ LBS.writeFile topologyPath $ encode topology
+      Left e -> do
+        -- There can be multiple reasons for why both decodings have failed.
+        -- Here we assume, very optimistically, that the user has already
+        -- instantiated it with a concrete topology file.
+        liftIOAnnotated . putStrLn $ "Could not decode topology file: " <> topologyPath <> ". This may be okay. Reason for decoding failure is:\n" ++ e
 
   -- If necessary, update the time stamps in Byron and Shelley Genesis files.
   -- This is a QoL feature so that users who edit their configuration files don't
@@ -388,7 +352,7 @@ cardanoTestnet
   -- FIXME: use foldEpochState waiting for chain extensions
   now <- liftIOAnnotated DTC.getCurrentTime
   let deadline = DTC.addUTCTime 45 now
-  forM_ (map nodeStdout testnetNodes') $ \nodeStdoutFile -> do
+  forM_ testnetNodes' $ \nodeStdoutFile -> do
     assertChainExtended deadline nodeLoggingFormat nodeStdoutFile
 
   let runtime = TestnetRuntime

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Node/Shutdown.hs

@@ -107,7 +107,7 @@ hprop_shutdown = integrationRetryWorkspace 2 "shutdown" $ \tempAbsBasePath' -> H
 
   -- 2. Create Alonzo genesis
   alonzoBabbageTestGenesisJsonTargetFile <- H.noteShow $ tempAbsPath' </> shelleyDir </> "genesis.alonzo.spec.json"
-  gen <- liftToIntegration $ Testnet.getDefaultAlonzoGenesis sbe
+  gen <- liftToIntegration Testnet.getDefaultAlonzoGenesis 
   liftIOAnnotated $ LBS.writeFile alonzoBabbageTestGenesisJsonTargetFile $ encode gen
 
   -- 2. Create Conway genesis