Integrate latest ledger, network, consensus

IntersectMBO · May 2, 2024 · 42d6f0f · 42d6f0f
1 parent c3abf88
commit 42d6f0f
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 10 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,12 +14,66 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-03-18T13:14:14Z
-  , cardano-haskell-packages 2024-04-04T10:00:00Z
+  , cardano-haskell-packages 2024-04-24T00:00:00Z
 
 packages:
     cardano-api
     cardano-api-gen
 
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-ledger
+  tag: be59c234150b6c5a24596ec6829810c2d2dfa732
+  --sha256: sha256-lmX76vtQ8gEDizUmByZ2XL6SYhBxxMQtZVBeIEp/8Lw=
+  subdir: eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-api
+    libs/cardano-ledger-core
+    libs/cardano-ledger-binary
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/cardano-data
+    libs/set-algebra
+    libs/vector-map
+    eras/byron/chain/executable-spec
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/byron/crypto
+    eras/byron/crypto/test
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network
+  tag: a38e5a1b6305bd830ae7d088942ff709e187e3fc
+  --sha256: sha256-L/EV1MX3Dhq2+Hlg+F/3Y2h8YLeld05hUGty2VRrsuM=
+  subdir: ouroboros-network
+          ouroboros-network-api
+          ouroboros-network-framework
+          ouroboros-network-protocols
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-consensus
+  tag: 0a1a154f08926b7b24bcc0a9ddba5aa02a2568ab
+  --sha256: sha256-/cceqSX+SqJ69vGFkf/2bdR3S8rPyTYcuWcBIYJysN4=
+  subdir: ouroboros-consensus
+          ouroboros-consensus-cardano
+          ouroboros-consensus-protocol
+          ouroboros-consensus-diffusion
+          sop-extras
+          strict-sop-core
+
 program-options
   ghc-options: -Werror
 

diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -162,7 +162,7 @@ library internal
                       , cardano-crypto-class ^>= 2.1.2
                       , cardano-crypto-wrapper ^>= 1.5
                       , cardano-data >= 1.0
-                      , cardano-ledger-alonzo >= 1.7.0
+                      , cardano-ledger-alonzo >= 1.8.0
                       , cardano-ledger-allegra >= 1.3
                       , cardano-ledger-api ^>= 1.9
                       , cardano-ledger-babbage >= 1.6.0
@@ -194,17 +194,17 @@ library internal
                       , optparse-applicative-fork
                       , ouroboros-consensus ^>= 0.17
                       , ouroboros-consensus-cardano ^>= 0.15
-                      , ouroboros-consensus-diffusion ^>= 0.13
+                      , ouroboros-consensus-diffusion ^>= 0.15
                       , ouroboros-consensus-protocol ^>= 0.8
                       , ouroboros-network
                       , ouroboros-network-api ^>= 0.7
                       , ouroboros-network-framework
                       , ouroboros-network-protocols
                       , parsec
-                      , plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>= 1.23.0
+                      , plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>= 1.26.0
                       , prettyprinter
                       , prettyprinter-ansi-terminal
-                      , prettyprinter-configurable ^>= 1.23.0
+                      , prettyprinter-configurable ^>= 1.26.0
                       , random
                       , safe-exceptions
                       , scientific
@@ -377,8 +377,8 @@ test-suite cardano-api-golden
                       , hedgehog-extras ^>= 0.6.1.0
                       , microlens
                       , parsec
-                      , plutus-core ^>= 1.23
-                      , plutus-ledger-api ^>= 1.23.0
+                      , plutus-core ^>= 1.26
+                      , plutus-ledger-api ^>= 1.26.0
                       , tasty
                       , tasty-hedgehog
                       , time

diff --git a/cardano-api/internal/Cardano/Api/Genesis.hs b/cardano-api/internal/Cardano/Api/Genesis.hs
@@ -62,6 +62,7 @@ import           GHC.Stack (HasCallStack)
 import           Lens.Micro
 
 import           Test.Cardano.Ledger.Core.Rational ((%!))
+import           Test.Cardano.Ledger.Plutus (testingCostModelV3)
 
 data ShelleyConfig = ShelleyConfig
   { scConfig :: !(Ledger.ShelleyGenesis Shelley.StandardCrypto)
@@ -169,6 +170,7 @@ conwayGenesisDefaults = ConwayGenesis { cgUpgradePParams = defaultUpgradeConwayP
                                                     , ucppCommitteeMinSize = 0
                                                     , ucppCommitteeMaxTermLength = EpochInterval 200
                                                     , ucppMinFeeRefScriptCostPerByte = 0 %! 1 -- TODO: set to correct value after benchmarking
+                                                    , ucppPlutusV3CostModel = testingCostModelV3
                                                     }
     where
     defaultPoolVotingThresholds :: PoolVotingThresholds

diff --git a/flake.lock b/flake.lock