8.0 bench

.gitignore

@@ -64,3 +64,6 @@ logs
 /testnet
 
 .vscode/
+
+# Test artifacts
+cardano-tracer/cardano-tracer-test

bench/cardano-topology/cardano-topology.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-topology
-version:                1.36.0
+version:                8.0.0
 synopsis:               A cardano topology generator
 description:            A cardano topology generator.
 category:               Cardano,

bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs

@@ -57,9 +57,10 @@ import           Prelude
 import           Cardano.Benchmarking.GeneratorTx
 import qualified Cardano.Benchmarking.LogTypes as Tracer
 import           Cardano.Benchmarking.OuroborosImports (NetworkId, PaymentKey, ShelleyGenesis,
-                   SigningKey, StandardShelley)
+                   SigningKey)
 import           Cardano.Benchmarking.Script.Types
 import           Cardano.Benchmarking.Wallet
+import           Cardano.Ledger.Crypto (StandardCrypto)
 import           Cardano.Node.Protocol.Types (SomeConsensusProtocol)
 import           Ouroboros.Network.NodeToClient (IOManager)
 
@@ -69,7 +70,7 @@ import           Cardano.TxGenerator.Types (TxGenError (..))
 
 data Env = Env { protoParams :: Maybe ProtocolParameterMode
                , benchTracers :: Maybe Tracer.BenchTracers
-               , envGenesis :: Maybe (ShelleyGenesis StandardShelley)
+               , envGenesis :: Maybe (ShelleyGenesis StandardCrypto)
                , envProtocol :: Maybe SomeConsensusProtocol
                , envNetworkId :: Maybe NetworkId
                , envSocketPath :: Maybe FilePath
@@ -125,7 +126,7 @@ setProtoParamMode val = modifyEnv (\e -> e { protoParams = pure val })
 setBenchTracers :: Tracer.BenchTracers -> ActionM ()
 setBenchTracers val = modifyEnv (\e -> e { benchTracers = pure val })
 
-setEnvGenesis :: ShelleyGenesis StandardShelley -> ActionM ()
+setEnvGenesis :: ShelleyGenesis StandardCrypto -> ActionM ()
 setEnvGenesis val = modifyEnv (\e -> e { envGenesis = pure val })
 
 setEnvKeys :: String -> SigningKey PaymentKey -> ActionM ()
@@ -168,7 +169,7 @@ getProtoParamMode = getEnvVal protoParams "ProtocolParameterMode"
 getBenchTracers :: ActionM Tracer.BenchTracers
 getBenchTracers = getEnvVal benchTracers "BenchTracers"
 
-getEnvGenesis :: ActionM (ShelleyGenesis StandardShelley)
+getEnvGenesis :: ActionM (ShelleyGenesis StandardCrypto)
 getEnvGenesis = getEnvVal envGenesis "Genesis"
 
 getEnvKeys :: String -> ActionM (SigningKey PaymentKey)

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

@@ -176,5 +176,4 @@ preExecutePlutusV2 protocolVersion_ (PlutusScript _ (PlutusScriptSerialised scri
 -- However, we're bound to the type `Cardano.Api.ProtocolParameters.CostModel` which
 -- might be changed from a key-value map to something providing stronger guarantees.
 flattenCostModel :: CostModel -> [Integer]
-flattenCostModel (CostModel cm)
-  = snd <$> Map.toAscList cm
+flattenCostModel (CostModel cm) = cm

bench/tx-generator/src/Cardano/TxGenerator/Types.hs

@@ -16,14 +16,14 @@ import           GHC.Natural
 import           Cardano.Api
 
 import           Cardano.Api.Shelley (ProtocolParameters)
+import           Cardano.Ledger.Crypto (StandardCrypto)
 import qualified Cardano.Ledger.Shelley.API as Ledger (ShelleyGenesis)
-import           Ouroboros.Consensus.Shelley.Eras (StandardShelley)
 -- import           Cardano.Node.Protocol.Types (SomeConsensusProtocol)
 
 import           Cardano.TxGenerator.Fund (Fund)
 
 -- convenience alias for use trhougout the API
-type ShelleyGenesis       = Ledger.ShelleyGenesis StandardShelley
+type ShelleyGenesis       = Ledger.ShelleyGenesis StandardCrypto
 
 -- some type aliases to keep compatibility with code in Cardano.Benchmarking
 type NumberOfInputsPerTx  = Int

bench/tx-generator/tx-generator.cabal

@@ -98,6 +98,7 @@ library
                       , cardano-git-rev
                       , cardano-ledger-alonzo
                       , cardano-ledger-byron
+                      , cardano-ledger-core
                       , cardano-node
                       , cardano-prelude
                       , contra-tracer

cabal.project

@@ -37,41 +37,41 @@ packages:
     trace-resources
     trace-forward
 
-extra-packages:
-  ouroboros-consensus-cardano-tools
+-- extra-packages:
+--   ouroboros-consensus-cardano-tools
 
-package cardano-api
+program-options
   ghc-options: -Werror
 
-package cardano-cli
+package cardano-api
   ghc-options: -Werror
 
-package cardano-git-rev
-  ghc-options: -Werror
+-- package cardano-cli
+--   ghc-options: -Werror
 
 package cardano-node
   ghc-options: -Werror
 
-package cardano-node-chairman
-  ghc-options: -Werror
+-- package cardano-node-chairman
+--   ghc-options: -Werror
 
-package cardano-testnet
-  ghc-options: -Werror
+-- package cardano-testnet
+--   ghc-options: -Werror
 
-package tx-generator
-  ghc-options: -Werror
+-- package tx-generator
+--   ghc-options: -Werror
 
-package trace-dispatcher
-  ghc-options: -Werror
+-- package trace-dispatcher
+--   ghc-options: -Werror
 
-package trace-resources
-  ghc-options: -Werror
+-- package trace-resources
+--   ghc-options: -Werror
 
-package cardano-tracer
-  ghc-options: -Werror
+-- package cardano-tracer
+--   ghc-options: -Werror
 
-package submit-api
-  ghc-options: -Werror
+-- package submit-api
+--   ghc-options: -Werror
 
 package cryptonite
   -- Using RDRAND instead of /dev/urandom as an entropy source for key
@@ -94,7 +94,7 @@ allow-newer:
   -- ekg does not suport newer snap
   , ekg:snap-server
   , ekg:snap-core
-  -- cardano-node-capi depends on aeson > 2.1, even our patched ekg-json only 
+  -- cardano-node-capi depends on aeson > 2.1, even our patched ekg-json only
   -- supports between 2 and 2.1
   , ekg-json:aeson
   -- These are currently required for 9.2.
@@ -108,3 +108,76 @@ allow-newer:
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+-- And has the adjustments for the ledger refactor
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-network
+  tag: 7f6afd7ba652bd20d5aaf31a9450dddda7e2f0bd
+  --sha256: 0wlvgiiyqp14xd7d49h9709dg2dv7wk1b44kbdy596mg8g3v93nw
+  subdir:
+    monoidal-synchronisation
+    network-mux
+    ouroboros-consensus
+    ouroboros-consensus-byron
+    ouroboros-consensus-cardano
+    ouroboros-consensus-protocol
+    ouroboros-consensus-shelley
+    ouroboros-network
+    ouroboros-network-framework
+    ouroboros-network-testing
+    ouroboros-network-protocols
+    ouroboros-consensus-cardano-tools
+    ouroboros-consensus-diffusion
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/fs-sim
+  tag: 13a1cfa5a82740c5723fb0a279b3f32f98c8b494
+  --sha256: 1q783gsb0hh4i0slvfwp5nppi8h425pkvj0kqr2lpl06y7y2gq41
+  subdir:
+    fs-api
+    fs-sim
+
+-- Waiting for proper Windows ghc-9.2 release.
+source-repository-package
+   type: git
+   location: https://github.com/input-output-hk/snap-core
+   tag: b87b2ffa52bf58867a7239ebe74f61b1a2c762d2
+   --sha256: 0ndm57z5zpxd5n8s47kh8k1jfqf3b78qv7gkgrx9wwaajs9bf196
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: 5fe9e9e02622cb1d7794b8dbd068a7bc7122aa74
+  --sha256: 08m4wxsdg5nn1ilvamdxss24ipkb5gkmqw2q2fsh6ng3sy0bfzy2
+  subdir:
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/allegra/impl
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/byron/chain/executable-spec
+    eras/byron/crypto
+    eras/byron/crypto/test
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley-ma/impl
+    eras/shelley-ma/test-suite
+    eras/shelley/impl
+    eras/shelley/test-suite
+    libs/cardano-data
+    libs/cardano-ledger-api
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-core
+    libs/cardano-ledger-pretty
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/set-algebra
+    libs/small-steps
+    libs/small-steps-test
+    libs/vector-map

cardano-api/ChangeLog.md

@@ -4,6 +4,10 @@
 
 ### Features
 
+- Changed type of `protocolParamTxFeeFixed`, `protocolParamTxFeePerByte` from `Natural` to
+  `Lovelace` and `protocolUpdateTxFeeFixed` and `protocolUpdateTxFeePerByte` from `Maybe
+  Natural` to `Maybe Lovelace`
+
 - Append, not prepend change output when balancing a transaction ([PR 4343](https://github.com/input-output-hk/cardano-node/pull/4343))
 
 - Expose convenience functions `executeQueryCardanoMode`, `determineEra`, `constructBalancedTx` and `queryStateForBalancedTx` ([PR 4446](https://github.com/input-output-hk/cardano-node/pull/4446))

cardano-api/cardano-api.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-api
-version:                1.36.0
+version:                8.0.0
 synopsis:               The cardano api
 description:            The cardano api.
 category:               Cardano,
@@ -109,24 +109,28 @@ library
   build-depends:        aeson             >= 1.5.6.0
                       , aeson-pretty      >= 0.8.5
                       , attoparsec
-                      , array
                       , base16-bytestring >= 1.0
                       , base58-bytestring
                       , bech32 >= 1.1.0
                       , bytestring
                       , cardano-binary
                       , cardano-crypto
-                      , cardano-crypto-class ^>= 2.0
-                      , cardano-crypto-wrapper ^>= 1.4
-                      , cardano-data ^>= 0.1
-                      , cardano-ledger-alonzo ^>= 0.1
-                      , cardano-ledger-babbage ^>= 0.1
-                      , cardano-ledger-conway
-                      , cardano-ledger-byron ^>= 0.1
-                      , cardano-ledger-core ^>= 0.1
-                      , cardano-ledger-shelley-ma ^>= 0.1
-                      , cardano-protocol-tpraos >= 0.1
+                      , cardano-crypto-class ^>= 2.1
+                      , cardano-crypto-wrapper ^>= 1.5
+                      , cardano-data ^>= 1.0
+                      , cardano-ledger-alonzo ^>= 1.1
+                      , cardano-ledger-allegra ^>= 1.1
+                      , cardano-ledger-api >= 1.1
+                      , cardano-ledger-babbage ^>= 1.1
+                      , cardano-ledger-binary ^>= 1.1
+                      , cardano-ledger-byron ^>= 1.0
+                      , cardano-ledger-conway ^>= 1.1
+                      , cardano-ledger-core ^>= 1.1
+                      , cardano-ledger-mary ^>= 1.1
+                      , cardano-ledger-shelley ^>= 1.1
+                      , cardano-protocol-tpraos >= 1.0.1
                       , cardano-slotting >= 0.1
+                      , cardano-strict-containers ^>= 0.1
                       , cborg
                       , contra-tracer
                       , containers
@@ -160,19 +164,15 @@ library
                       , random
                       , scientific
                       , serialise
-                      , small-steps ^>= 0.1
-                      , cardano-ledger-shelley ^>= 0.1
-                      , small-steps ^>= 0.1
+                      , small-steps ^>= 1.0
                       , stm
-                      , cardano-strict-containers ^>= 0.1
                       , text
                       , time
                       , transformers
                       , transformers-except ^>= 0.1.3
                       , typed-protocols ^>= 0.1
                       , unordered-containers >= 0.2.11
                       , vector
-                      , vector-map ^>= 0.1
                       , yaml
 
 library gen
@@ -193,14 +193,14 @@ library gen
                       , base16-bytestring
                       , bytestring
                       , cardano-api
-                      , cardano-binary
-                      , cardano-crypto-class ^>= 2.0
-                      , cardano-crypto-test ^>= 1.4
-                      , cardano-ledger-alonzo ^>= 0.1
-                      , cardano-ledger-alonzo-test ^>= 0.1
-                      , cardano-ledger-byron-test ^>= 1.4
-                      , cardano-ledger-core ^>= 0.1
-                      , cardano-ledger-shelley ^>= 0.1
+                      , cardano-binary ^>= 1.6
+                      , cardano-crypto-class ^>= 2.1
+                      , cardano-crypto-test ^>= 1.5
+                      , cardano-ledger-alonzo ^>= 1.1
+                      , cardano-ledger-alonzo-test
+                      , cardano-ledger-byron-test ^>= 1.5
+                      , cardano-ledger-core ^>= 1.1
+                      , cardano-ledger-shelley ^>= 1.1
                       , containers
                       , hedgehog
                       , text
@@ -215,23 +215,24 @@ test-suite cardano-api-test
                       , bytestring
                       , cardano-api
                       , cardano-api:gen
-                      , cardano-data ^>= 0.1
+                      , cardano-data ^>= 1.0
                       , cardano-crypto
-                      , cardano-crypto-class ^>= 2.0
-                      , cardano-crypto-test ^>= 1.4
-                      , cardano-crypto-tests ^>= 2.0
-                      , cardano-ledger-alonzo ^>= 0.1
-                      , cardano-ledger-core ^>= 0.1
+                      , cardano-crypto-class ^>= 2.1
+                      , cardano-crypto-test ^>= 1.5
+                      , cardano-crypto-tests ^>= 2.1
+                      , cardano-ledger-api ^>= 1.1
+                      , cardano-ledger-core:{cardano-ledger-core, testlib} ^>= 1.1
+                      , cardano-ledger-shelley ^>= 1.1
+                      , cardano-ledger-shelley-test ^>= 1.1
                       , cardano-slotting ^>= 0.1
                       , containers
                       , hedgehog
                       , hedgehog-extras ^>= 0.4
+                      , hedgehog-quickcheck
                       , mtl
-                      , ouroboros-consensus
+                      , microlens
                       , ouroboros-consensus-shelley
                       , QuickCheck
-                      , cardano-ledger-shelley ^>= 0.1
-                      , cardano-ledger-shelley-test ^>= 0.1
                       , tasty
                       , tasty-hedgehog
                       , tasty-quickcheck