WIP: -nomadperf

fmaste · fmaste · commit be2fd171f279 · 2026-03-20T08:02:20.000Z
diff --git a/bench/cardano-profile/src/Cardano/Benchmarking/Profile/Vocabulary.hs b/bench/cardano-profile/src/Cardano/Benchmarking/Profile/Vocabulary.hs
@@ -116,11 +116,11 @@ genesisVariantVoltaire = genesisVariantLatest
 
 -- Defined in the "genesis" property and it's for the tx-generator.
 fundsDefault :: Types.Profile -> Types.Profile
-fundsDefault = P.poolBalance 1000000000000000 . P.funds 10000000000000 . P.utxoKeys (6*500*3)
+fundsDefault = P.poolBalance 1000000000000000 . P.funds 10000000000000 . P.utxoKeys (52*500*3)
 
 -- Some profiles have a higher `funds_balance` in `Genesis`. Needed? Fix it?
 fundsDouble :: Types.Profile -> Types.Profile
-fundsDouble =  P.poolBalance 1000000000000000 . P.funds 20000000000000 . P.utxoKeys 1
+fundsDouble =  P.poolBalance 1000000000000000 . P.funds 20000000000000 . P.utxoKeys (52*500*3)
 
 fundsVoting :: Types.Profile -> Types.Profile
 fundsVoting =  P.poolBalance 1000000000000000 . P.funds 40000000000000 . P.utxoKeys 2
diff --git a/bench/tx-centrifuge/app/Main.hs b/bench/tx-centrifuge/app/Main.hs
@@ -95,10 +95,6 @@ import Control.Concurrent.STM qualified as STM
 ------------------
 import Control.Monad.Trans.Except (runExceptT)
 ------------------
--- tx-generator --
-------------------
-import Cardano.TxGenerator.ProtocolParameters qualified as PP
-------------------
 -- pull-fiction --
 ------------------
 import Cardano.Benchmarking.PullFiction.Config.Raw qualified as Raw
@@ -123,7 +119,7 @@ main = do
   -- Config.
   ----------
 
-  (runtime, codecConfig, networkId, networkMagic, ledgerPP, tracers) <- loadConfig
+  (runtime, codecConfig, networkId, networkMagic, tracers) <- loadConfig
 
   -- Launch.
   ----------
@@ -148,7 +144,7 @@ main = do
                 replicateM
                   (fromIntegral (inputsPerTx vb))
                   (STM.readTQueue fundQueue)
-              case Tx.buildTx ledgerPP signingAddr signingKey
+              case Tx.buildTx signingAddr signingKey
                            inputFunds (outputsPerTx vb) (L.Coin (fee vb)) of
                 Left err -> die $ "Tx.buildTx: " ++ err
                 Right ans@(tx, outputFunds) -> do
@@ -374,6 +370,23 @@ createSigningKeyAndAddress networkId n
                   Api.NoStakeAddress
           in (signingKey, signingAddr)
 
+--------------------------------------------------------------------------------
+-- Cardano parameters
+--------------------------------------------------------------------------------
+
+{-- TODO: Construct a minimal protocol parameters, see Tx.hs last line.
+data ProtocolParameters = ProtocolParameters
+  { epochLength :: Integer
+  , minFeeA     :: Integer
+  , minFeeB     :: Integer
+  } 
+
+instance Aeson.FromJSON ProtocolParameters where
+  parseJSON = Aeson.withObject "ProtocolParameters" $ \o -> do
+    pp <- o .: "params"
+    ProtocolParameters <$> pp .: "epoch_length" <*> pp .: "min_fee_a" <*> pp .: "min_fee_b"
+--}
+
 --------------------------------------------------------------------------------
 -- Initialization
 --------------------------------------------------------------------------------
@@ -392,8 +405,6 @@ loadConfig
         , Api.NetworkId
           -- | Network magic for the handshake with cardano-node.
         , Api.NetworkMagic
-          -- | Ledger protocol parameters for transaction building.
-        , Api.LedgerProtocolParameters Api.ConwayEra
           -- | Logging / metrics tracers.
         , Tracing.Tracers
         )
@@ -417,7 +428,6 @@ loadConfig = do
           Left err -> die $ "Config: " ++ err
           Right v  -> pure v
   nodeConfigPath <- parseField "nodeConfig"
-  ppPath         <- parseField "protocolParametersFile"
   raw <- case Aeson.fromJSON rawValue of
     Aeson.Error err   -> die $ "JSON: " ++ err
     Aeson.Success cfg -> pure cfg
@@ -450,19 +460,10 @@ loadConfig = do
       networkId    = protocolToNetworkId protocol
       networkMagic = protocolToNetworkMagic protocol
 
-  -- Load protocol parameters.
-  hPutStrLn stderr $ "Loading protocol parameters from: " ++ ppPath
-  protocolParameters <-
-    Aeson.eitherDecodeFileStrict' ppPath >>= either die pure
-  ledgerPP <- case PP.convertToLedgerProtocolParameters
-                     Api.ShelleyBasedEraConway protocolParameters of
-    Left err -> die $ "convertToLedgerProtocolParameters: " ++ show err
-    Right pp -> pure pp
-
   -- Tracers.
   tracers <- Tracing.setupTracers configFile
 
-  pure ( runtime, codecConfig, networkId, networkMagic, ledgerPP, tracers )
+  pure ( runtime, codecConfig, networkId, networkMagic, tracers )
 
 --------------------------------------------------------------------------------
 -- Protocol helpers (inlined from NodeConfig.hs and OuroborosImports.hs)
diff --git a/bench/tx-centrifuge/lib/tx-centrifuge/Cardano/Benchmarking/TxCentrifuge/Tx.hs b/bench/tx-centrifuge/lib/tx-centrifuge/Cardano/Benchmarking/TxCentrifuge/Tx.hs
@@ -39,10 +39,8 @@ import Cardano.Benchmarking.TxCentrifuge.Fund ( Fund(..) )
 --
 -- Fixed to ConwayEra. No Plutus, no metadata, fixed fee.
 buildTx
-  -- | Ledger protocol parameters.
-  :: Api.LedgerProtocolParameters Api.ConwayEra
   -- | Destination address for outputs (embeds the network identifier).
-  -> Api.AddressInEra Api.ConwayEra
+  :: Api.AddressInEra Api.ConwayEra
   -- | Signing key for recycled output funds.
   -> Api.SigningKey Api.PaymentKey
   -- | Input funds.
@@ -52,7 +50,7 @@ buildTx
   -- | Fee.
   -> L.Coin
   -> Either String (Api.Tx Api.ConwayEra, [Fund])
-buildTx ledgerPP destAddr outKey inFunds numOutputs fee
+buildTx destAddr outKey inFunds numOutputs fee
   | null inFunds = Left "buildTx: no input funds"
   | numOutputs == 0 = Left "buildTx: outputs_per_tx must be >= 1"
   | feeLovelace < 0 = Left "buildTx: fee must be >= 0"
@@ -165,4 +163,7 @@ buildTx ledgerPP destAddr outKey inFunds numOutputs fee
               Api.ShelleyBasedEraConway
           )
       & Api.setTxMetadata Api.TxMetadataNone
-      & Api.setTxProtocolParams (Api.BuildTxWith (Just ledgerPP))
+      -- We are using an explicit fee!
+      -- Using `Nothing` instead of `ledgerPP :: Api.LedgerProtocolParameters Api.ConwayEra`.
+      -- TODO: Will need something else for plutus scripts!
+      & Api.setTxProtocolParams (Api.BuildTxWith Nothing)
diff --git a/nix/workbench/backend/nomad-job.nix b/nix/workbench/backend/nomad-job.nix
@@ -895,7 +895,7 @@ let
                   in
                      # Recreate the "run-script.json" with IPs and ports that are
                      # nomad template variables.
-                     (runScriptToGoTemplate
+                     (runScriptToGoTemplate2
                        runScript
                        # Just the node names.
                        (lib.attrsets.mapAttrsToList
@@ -1394,6 +1394,32 @@ let
         ''
   ;
 
+  runScriptToGoTemplate2 = runScript: _: builtins.replaceStrings
+    (
+      (builtins.genList
+        (i: ''__addr_${toString i}__'')
+        100
+      )  
+      ++
+      (builtins.genList
+        (i: ''"__port_${toString i}__"'')
+        100
+      )
+    )
+    (
+      (builtins.genList
+        (i: ''{{range nomadService "${(nodeNameToServicePortName "node-${toString i}")}"}}{{.Address}}{{end}}'')
+        100
+      )  
+      ++
+      (builtins.genList
+        (i: ''{{range nomadService "${(nodeNameToServicePortName "node-${toString i}")}"}}{{.Port}}{{end}}'')
+        100
+      )
+    )
+    (lib.generators.toJSON {} runScript)
+  ;
+
   # Convert from generator's "run-script.json" with all addresses being
   # "127.0.0.01" to one with all addresses being a placeholder like
   # "{{NOMAD_IP_node-X}}".
diff --git a/nix/workbench/service/generator.nix b/nix/workbench/service/generator.nix
@@ -191,7 +191,7 @@ __toJSON
           rate_limit =
             { scope = "shared";
               type = "token_bucket";
-              params = { tps = 15; };
+              params = { tps = 12; };
             }
           ;
           max_batch_size = 500;
@@ -205,8 +205,11 @@ __toJSON
                     value =
                       { targets =
                           { "${toString i}" =
-                              { addr = "127.0.0.1";
-                                port = (30000 + i);
+                            #  { addr = "127.0.0.1";
+                            #    port = (30000 + i);
+                            #  }
+                              { addr = "__addr_${toString i}__";
+                                port = "__port_${toString i}__";
                               }
                             ;
                           }
@@ -221,7 +224,12 @@ __toJSON
           # tx-centrifuge parameters.
           ###########################
           nodeConfig = "../${runningNode}/config.json";
-          protocolParametersFile = "/tmp/protocol-parameters-queried.json";
+          protocol_parameters =
+            { epoch_length = profile.genesis.shelley.epochLength;
+              min_fee_a = profile.genesis.shelley.protocolParams.minFeeA;
+              min_fee_b = profile.genesis.shelley.protocolParams.minFeeB;
+            }
+          ;
           # Tracing parameters.
           #####################
           TraceOptions =
