create-testnet-data: take default value of --total-supply from shelle…

…y genesis + default delegated supply to half the total supply (no default anymore)
IntersectMBO · Aug 23, 2024 · 9db2c14 · 9db2c14
1 parent 9f2ec91
commit 9db2c14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
@@ -328,10 +328,9 @@ pGenesisCreateTestNetData sbe envCli =
             , Opt.metavar "LOVELACE"
             , Opt.help $
                 mconcat
-                  [ "The maximum possible amount of Lovelace, which is evenly distributed across stake holders. Defaults to 1 million Ada (i.e. 10^12 Lovelace)."
+                  [ "The maximum possible amount of Lovelace, which is evenly distributed across stake holders. Overrides the value from the shelley genesis."
                   , " If --delegated-supply is specified, a part of this amount will be delegated."
                   ]
-            , Opt.value 1_000_000_000_000
             ]
   pSupplyDelegated :: Parser (Maybe Coin)
   pSupplyDelegated =
@@ -343,10 +342,9 @@ pGenesisCreateTestNetData sbe envCli =
             , Opt.metavar "LOVELACE"
             , Opt.help $
                 mconcat
-                  [ "The amount of the total supply which is evenly delegated. Defaults to 500 000 Ada (i.e. (10^12) / 2 Lovelace)."
+                  [ "The amount of the total supply which is evenly delegated. Defaulted to half of the total supply."
                   , " Cannot be more than the amount specified with --total-supply."
                   ]
-            , Opt.value 500_000_000_000
             ]
   pRelays :: Parser FilePath
   pRelays =

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
@@ -738,7 +738,7 @@ updateOutputTemplate
     totalSupply = fromIntegral $ maybe maximumLovelaceSupply unLovelace mTotalSupply
 
     delegCoinRaw, nonDelegCoinRaw :: Integer
-    delegCoinRaw = maybe 0 unLovelace mDelegatedSupply
+    delegCoinRaw = maybe (totalSupply `div` 2) unLovelace mDelegatedSupply
     -- Since the user can specify total supply and delegated amount, the non-delegated amount is:
     nonDelegCoinRaw = totalSupply - delegCoinRaw