Bump CHaP, remove SRP, fix --supply error in CLI in testnet tests, in…

…crease testnet initial total supply
IntersectMBO · Feb 7, 2024 · 9b0aee6 · 9b0aee6
1 parent d99a5b5
commit 9b0aee6
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -38,7 +38,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2024-02-05"
+      CABAL_CACHE_VERSION: "2024-02-07"
 
     concurrency:
       group: >

diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -100,7 +100,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.38
                       , cardano-binary
-                      , cardano-cli ^>= 8.19.0.0
+                      , cardano-cli ^>= 8.20.0.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-02-06T15:14:59Z
-  , cardano-haskell-packages 2024-02-06T15:25:20Z
+  , cardano-haskell-packages 2024-02-07T07:51:35Z
 
 packages:
   cardano-git-rev
@@ -60,10 +60,3 @@ package plutus-scripts-bench
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
 -- `smtp-mail` should depend on `crypton-connection` rather than `connection`!
-
-source-repository-package
-    type: git
-    location: https://github.com/IntersectMBO/cardano-cli.git
-    tag: 760a6f5c84a5ad4480fcb10bec52faea6c3d73a1
-    subdir: cardano-cli
-    --sha256: sha256-xXqbKL9nUHwj4VLOFSNTL1RA/bdDCcvBLg8DnmjGcSw=
diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -89,5 +89,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 8.19.0.0
+                      , cardano-cli:cardano-cli ^>= 8.20
                       , cardano-node-chairman:cardano-node-chairman
diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -41,7 +41,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.38
                       , cardano-binary
-                      , cardano-cli ^>= 8.19.0.0
+                      , cardano-cli ^>= 8.20.0.0
                       , cardano-crypto-class ^>= 2.1.2
                       , http-media
                       , iohk-monitoring

diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -35,7 +35,7 @@ library
                       , ansi-terminal
                       , bytestring
                       , cardano-api ^>= 8.38
-                      , cardano-cli ^>= 8.19.0.0
+                      , cardano-cli ^>= 8.20.0.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-ledger-alonzo

diff --git a/cardano-testnet/src/Testnet/Components/Configuration.hs b/cardano-testnet/src/Testnet/Components/Configuration.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeApplications #-}
 
@@ -116,11 +117,11 @@ createSPOGenesisAndFiles (NumPools numPoolNodes) era shelleyGenesis (TmpAbsolute
  -- 50 second epochs
  -- Epoch length should be "10 * k / f" where "k = securityParam, f = activeSlotsCoeff"
   H.rewriteJsonFile genesisShelleyFpAbs $ \o -> o
+    & L.key "protocolParams" .  L.key "rho" . L._Number  .~ 0.1
+    & L.key "protocolParams" .  L.key "tau" . L._Number  .~ 0.1
+    & L.key "protocolParams" . L.key "protocolVersion" . L.key "major" . L._Integer .~ 8
     & L.key "securityParam" . L._Integer .~ 5
-    & L.key "rho" . L._Double  .~ 0.1
-    & L.key "tau" . L._Double  .~ 0.1
     & L.key "updateQuorum" . L._Integer .~ 2
-    & L.key "protocolParams" . L.key "protocolVersion" . L.key "major" . L._Integer .~ 8
 
   -- TODO: create-testnet-data should have arguments for
   -- Alonzo and Conway genesis that are optional and if not
@@ -134,8 +135,8 @@ createSPOGenesisAndFiles (NumPools numPoolNodes) era shelleyGenesis (TmpAbsolute
     , "--spec-shelley", genesisShelleyFpAbs
     , "--testnet-magic", show @Word32 testnetMagic
     , "--pools", show @Int numPoolNodes
-    , "--supply", "1000000000000"
-    , "--supply-delegated", "1000000000000"
+    , "--total-supply",     show @Int 2_000_000_000_000
+    , "--delegated-supply", show @Int 1_000_000_000_000
     , "--stake-delegators", show @Int numStakeDelegators
     , "--utxo-keys", show numSeededUTxOKeys
     , "--drep-keys", "3"

diff --git a/flake.lock b/flake.lock
diff --git a/scripts/babbage/mkfiles.sh b/scripts/babbage/mkfiles.sh
@@ -109,8 +109,8 @@ $SED -i "${ROOT}/configuration.yaml" \
 $CARDANO_CLI genesis create-staked --genesis-dir "${ROOT}" \
   --testnet-magic "${NETWORK_MAGIC}" \
   --gen-pools 3 \
-  --supply 2000000000000 \
-  --supply-delegated 240000000002 \
+  --supply            2000000000000 \
+  --supply-delegated   240000000002 \
   --gen-stake-delegs 3 \
   --gen-utxo-keys 3