Merge branch 'master' into edgr/ux-topology-config-file

Author: the-headless-ghost

cardano-testnet/src/Parsers/Run.hs

@@ -87,12 +87,11 @@ runCardanoOptions CardanoTestnetCliOptions
           createTestnetEnv
             testnetOptions genesisOptions def
             conf
-          cardanoTestnet testnetOptions genesisOptions conf
+          cardanoTestnet testnetOptions conf
       UserProvidedEnv nodeEnvPath ->
         -- Run cardano-testnet in the sandbox provided by the user
         -- In that case, 'cardanoOutputDir' is not used
         runTestnet (UserProvidedEnv nodeEnvPath) $ \conf ->
           cardanoTestnet
             testnetOptions
-            genesisOptions
             conf{updateTimestamps=updateTimestamps}

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

@@ -208,12 +208,10 @@ createTestnetEnv
 cardanoTestnet :: ()
   => HasCallStack
   => CardanoTestnetOptions -- ^ The options to use
-  -> GenesisOptions
   -> Conf -- ^ Path to the test sandbox
   -> H.Integration TestnetRuntime
 cardanoTestnet
   testnetOptions
-  GenesisOptions{genesisTestnetMagic=testnetMagic}
   Conf
     { tempAbsPath=TmpAbsolutePath tmpAbsPath
     , updateTimestamps
@@ -225,9 +223,14 @@ cardanoTestnet
         } = testnetOptions
       nPools = cardanoNumPools testnetOptions
       nodeConfigFile = tmpAbsPath </> "configuration.yaml"
+      byronGenesisFile = tmpAbsPath </> "byron-genesis.json"
+      shelleyGenesisFile = tmpAbsPath </> "shelley-genesis.json"
 
   H.note_ OS.os
 
+  shelleyGenesis@ShelleyGenesis{sgNetworkMagic} <- H.readJsonFileOk shelleyGenesisFile
+  let testnetMagic :: Int = fromIntegral sgNetworkMagic
+
   wallets <- forM [1..3] $ \idx -> do
     let utxoKeys@KeyPair{verificationKey} = makePathsAbsolute $ Defaults.defaultUtxoKeys idx
     let paymentAddrFile = tmpAbsPath </> "utxo-keys" </> "utxo" <> show idx </> "utxo.addr"
@@ -306,9 +309,6 @@ cardanoTestnet
   -- This is a QoL feature so that users who edit their configuration files don't
   -- have to manually set up the start times themselves.
   when (updateTimestamps == UpdateTimestamps) $ do
-    let byronGenesisFile = tmpAbsPath </> "byron-genesis.json"
-        shelleyGenesisFile = tmpAbsPath </> "shelley-genesis.json"
-
     currentTime <- H.noteShowIO DTC.getCurrentTime
     startTime <- H.noteShow $ DTC.addUTCTime startTimeOffsetSeconds currentTime
 
@@ -318,11 +318,9 @@ cardanoTestnet
     let byronGenesis = byronGenesis'{gdStartTime = startTime}
     H.lbsWriteFile byronGenesisFile $ canonicalEncodePretty byronGenesis
 
-    -- Update start time in Shelley genesis file
-    eShelley <- H.readJsonFile shelleyGenesisFile
-    shelleyGenesis' :: ShelleyGenesis <- H.leftFail eShelley
-    let shelleyGenesis = shelleyGenesis'{sgSystemStart = startTime}
-    H.lbsWriteFile shelleyGenesisFile $ A.encodePretty shelleyGenesis
+    -- Update start time in Shelley genesis file (which has been read already)
+    let shelleyGenesis' = shelleyGenesis{sgSystemStart = startTime}
+    H.lbsWriteFile shelleyGenesisFile $ A.encodePretty shelleyGenesis'
 
   eTestnetNodes <- H.forConcurrently (zip [1..] portNumbersWithNodeOptions) $ \(i, (nodeOptions, port)) -> do
     let nodeName = Defaults.defaultNodeName i
@@ -426,7 +424,7 @@ createAndRunTestnet testnetOptions genesisOptions conf = do
   createTestnetEnv
     testnetOptions genesisOptions def
     conf
-  cardanoTestnet testnetOptions genesisOptions conf
+  cardanoTestnet testnetOptions conf
 
 -- | Retry an action when `NodeAddressAlreadyInUseError` gets thrown from an action
 retryOnAddressInUseError

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/DumpConfig.hs

@@ -69,6 +69,6 @@ hprop_dump_config = integrationRetryWorkspace 2 "dump-config-files" $ \tmpDir ->
   H.lbsWriteFile shelleyGenesisFile $ encodePretty shelleyGenesis
 
   -- Run testnet with generated config
-  runtime <- cardanoTestnet testnetOptions genesisOptions conf
+  runtime <- cardanoTestnet testnetOptions conf
 
   nodesProduceBlocks tmpDir runtime

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs

@@ -112,7 +112,7 @@ hprop_gov_no_confidence = integrationWorkspace "no-confidence" $ \tempAbsBasePat
     , testnetNodes
     , wallets=wallet0:_wallet1:_
     , configurationFile
-    } <- cardanoTestnet fastTestnetOptions genesisOptions conf
+    } <- cardanoTestnet fastTestnetOptions conf
 
   poolNode1 <- H.headM testnetNodes
   poolSprocket1 <- H.noteShow $ nodeSprocket poolNode1

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/MainnetParams.hs

@@ -45,7 +45,7 @@ hprop_mainnet_params = integrationRetryWorkspace 2 "mainnet-params" $ \tmpDir ->
   TestnetRuntime
     { testnetNodes
     , testnetMagic
-    } <- cardanoTestnet testnetOptions genesisOptions conf
+    } <- cardanoTestnet testnetOptions conf
 
   -- Get a running node
   TestnetNode{nodeSprocket} <- H.headM testnetNodes

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/P2PTopology.hs

@@ -43,6 +43,6 @@ hprop_p2p_topology = integrationRetryWorkspace 2 "p2p-topology" $ \tmpDir -> H.r
   (_topology :: P2P.NetworkTopology NodeId) <- H.leftFail eTopology
 
   -- Run testnet with generated config
-  runtime <- cardanoTestnet testnetOptions genesisOptions conf
+  runtime <- cardanoTestnet testnetOptions conf
 
   nodesProduceBlocks tmpDir runtime

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/UpdateTimeStamps.hs

@@ -45,9 +45,6 @@ hprop_update_time_stamps = integrationRetryWorkspace 2 "update-time-stamps" $ \t
   H.threadDelay $ double2Int $ realToFrac startTimeOffsetSeconds * 1_000_000 * 1.2
 
   -- Run testnet and specify to update time stamps before starting
-  runtime <- cardanoTestnet
-    testnetOptions
-    genesisOptions
-    conf{updateTimestamps = UpdateTimestamps}
+  runtime <- cardanoTestnet testnetOptions conf{updateTimestamps = UpdateTimestamps}
 
   nodesProduceBlocks tmpDir runtime

nix/docker/README.md

@@ -230,8 +230,7 @@ Note that once ledger state is converted, the cardano-node container will need
 to be run with a node configuration aligned with the new ledger state type,
 otherwise ledger replay from genesis will re-occur.
 
-For more info, see the [UTxO Migration Guide](https://ouroboros-consensus.cardano.intersectmbo.org/docs/for-developers/utxo-hd/migrating/).
-
+For more info, see the [UTxO Migration Guide](https://ouroboros-consensus.cardano.intersectmbo.org/docs/references/miscellaneous/utxo-hd/migrating/).
 
 ## Legacy Tracing System
 Cardano-node now defaults to using the new tracing system.  The legacy tracing