bump ledger to tip of master

IntersectMBO · Oct 10, 2022 · b9e5768 · b9e5768
1 parent a3a9c62
commit b9e5768
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 58 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
-index-state: 2022-07-01T00:00:00Z
+index-state: 2022-09-07T00:00:00Z
 
 packages: ./ouroboros-network-testing
           ./monoidal-synchronisation
@@ -23,14 +23,23 @@ packages: ./ouroboros-network-testing
           ./cardano-client
 
 constraints:
-    ip < 1.5
+  -- bizarre issue: in earlier versions they define their own 'GEq', in newer
+  -- ones they reuse the one from 'some', but there isn't e.g. a proper version
+  -- constraint from dependent-sum-template (which is the library we actually use).
+  , dependent-sum > 0.6.2.0
+
+  -- Plutus dependency
+  , algebraic-graphs >= 0.7
+
+  , ip < 1.5
   , hedgehog >= 1.0
   , bimap >= 0.4.0
   , ListLike >= 4.7.3
   , witherable >= 0.4
 
-  -- Plutus dependency
-  , algebraic-graphs < 0.7
+  , protolude >= 0.3.2
+
+  , persistent < 2.14
 
 package Win32-network
   tests: True
@@ -150,13 +159,9 @@ package prettyprinter-configurable
   tests: False
 
 allow-newer:
-  size-based:template-haskell
-
-constraints:
-  -- bizarre issue: in earlier versions they define their own 'GEq', in newer
-  -- ones they reuse the one from 'some', but there isn't e.g. a proper version
-  -- constraint from dependent-sum-template (which is the library we actually use).
-  , dependent-sum > 0.6.2.0
+  monoidal-containers:aeson,
+  size-based:template-haskell,
+  Unique:hashable
 
 -- ---------------------------------------------------------
 -- The "cabal" wrapper script provided by nix-shell will cut off / restore the remainder of this file
@@ -209,30 +214,33 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 631cb6cf1fa01ab346233b610a38b3b4cba6e6ab
-  --sha256: 0944wg2nqazmhlmsynwgdwxxj6ay0hb9qig9l128isb2cjia0hlp
+  tag: 46cd4c97cff9f1f0a0da976aa9e32bd2899c85ee
+  --sha256: 0qn56ahqmy79riwyaq5m0d4vpamdjkkk04b0x8zwlyd5y3pg58xd
   subdir:
     base-deriving-via
     binary
     binary/test
     cardano-crypto-class
     cardano-crypto-praos
     cardano-crypto-tests
+    heapwords
     measures
     orphans-deriving-via
     slotting
-    strict-containers
+    cardano-strict-containers
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: 49613f11e034485c8377945c86c0465726c0860c
-  --sha256: 0gxb9xghsacr0qaljhq3qzvmb2f1wwmly89prwqy4fdm9mvqiq95
+  tag: 863f1d2f53852369802f070e16509ba3c896b47a
+  --sha256: 1y5835mv1yzi5l19sa25sax4a846178zp69y69rzgwwalqsll4bh
   subdir:
     eras/alonzo/impl
     eras/alonzo/test-suite
     eras/babbage/impl
     eras/babbage/test-suite
+    eras/conway/impl
+    eras/conway/test-suite
     eras/byron/chain/executable-spec
     eras/byron/crypto
     eras/byron/crypto/test
@@ -256,8 +264,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/plutus
-  tag: 8ab4c3355c5fdf67dcf6acc1f5a14668d5e6f0a9
-  --sha256: 12d6bndmj0dxl6xlaqmf78326yp5hw093bmybmqfpdkvk4mgz03j
+  tag: ecbfc46d3302f438a31c4f2f8f30cd1a87dab271
+  --sha256: 1r16a9xk49bw3r9wihmf49p2f8pfqqymrpgf85lzccyjrxdvxd7r
   subdir:
     plutus-ledger-api
     plutus-tx

diff --git a/nix/ouroboros-network.nix b/nix/ouroboros-network.nix
@@ -4,7 +4,7 @@
 { lib, stdenv, pkgs, haskell-nix, buildPackages, config ? { }
   # Enable profiling
 , profiling ? config.haskellNix.profiling or false
-, libsodium-vrf ? pkgs.libsodium-vrf 
+, libsodium-vrf ? pkgs.libsodium-vrf
   # Enable strict TVar invariant check flag in strict-stm
 , checkTVarInvariant ? false }:
 let
@@ -45,7 +45,7 @@ let
           doCoverage = config.coverage;
         });
       }
-      {   
+      {
         packages.strict-stm.components.library.configureFlags =
           lib.mkForce (if checkTVarInvariant then ["-f checktvarinvariant"] else []);
       }
@@ -62,9 +62,9 @@ let
           lib.mkForce [ "--no-create" ];
 
         packages.cardano-crypto-praos.components.library.pkgconfig =
-          lib.mkForce [ [ libsodium-vrf ] ];
+          lib.mkForce [ [ libsodium-vrf pkgs.secp256k1 ] ];
         packages.cardano-crypto-class.components.library.pkgconfig =
-          lib.mkForce [ [ libsodium-vrf ] ];
+          lib.mkForce [ [ libsodium-vrf pkgs.secp256k1 ] ];
       }
 
       # Options specific to the windows cross-compiled build:

diff --git a/nix/sources.json b/nix/sources.json
@@ -1,30 +1,30 @@
 {
-    "hackage.nix": {
-        "branch": "master",
-        "description": "Automatically generated Nix expressions for Hackage",
-        "homepage": "",
-        "owner": "input-output-hk",
-        "repo": "hackage.nix",
-        "rev": "393b57332d272c6f3d3e0843a0294f3bae550083",
-        "sha256": "01qb38byx2vz653h1qiw6iq3y7k6s8axphg9qhg6sixx3pyigh6b",
-        "type": "tarball",
-        "url": "https://github.com/input-output-hk/hackage.nix/archive/393b57332d272c6f3d3e0843a0294f3bae550083.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "b3c99d7f13df89a9a918c835ecb7114098912962"
-    },
-    "haskell.nix": {
-        "branch": "master",
-        "description": "Alternative Haskell Infrastructure for Nixpkgs",
-        "homepage": "https://input-output-hk.github.io/haskell.nix",
-        "owner": "input-output-hk",
-        "repo": "haskell.nix",
-        "rev": "bc1de42afab6ede4a8630c133717dd0e96883a34",
-        "sha256": "0xi4g5n83j89wyss7m65y2v1d1z758h0axv1ibr2r21qa6mma1dq",
-        "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/bc1de42afab6ede4a8630c133717dd0e96883a34.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "962ecfed3a4fb656b5a91d89159291e00ed766bc"
-    },
+  "hackage.nix": {
+    "branch": "master",
+    "description": "Automatically generated Nix expressions for Hackage",
+    "homepage": "",
+    "owner": "input-output-hk",
+    "repo": "hackage.nix",
+    "rev": "1a5c4c394b23fa5d6820e59d65d02b40a13abaa1",
+    "sha256": "0nh6pz7f6b5digdfcccpl8ycsrkyhkzq9mpamr284ypndpwhyypz",
+    "type": "tarball",
+    "url": "https://github.com/input-output-hk/hackage.nix/archive/1a5c4c394b23fa5d6820e59d65d02b40a13abaa1.tar.gz",
+    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+    "version": "b3c99d7f13df89a9a918c835ecb7114098912962"
+  },
+  "haskell.nix": {
+    "branch": "master",
+    "description": "Alternative Haskell Infrastructure for Nixpkgs",
+    "homepage": "https://input-output-hk.github.io/haskell.nix",
+    "owner": "input-output-hk",
+    "repo": "haskell.nix",
+    "rev": "3bbbb40cc0babb6d7f6b3b92d3ee25b934484cdc",
+    "sha256": "0qq2zvy925glbm4gdplw630fwpq69n7bqjh7dcfsy41w2283f103",
+    "type": "tarball",
+    "url": "https://github.com/input-output-hk/haskell.nix/archive/3bbbb40cc0babb6d7f6b3b92d3ee25b934484cdc.tar.gz",
+    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+    "version": "962ecfed3a4fb656b5a91d89159291e00ed766bc"
+  },
     "iohk-nix": {
         "branch": "master",
         "description": "nix scripts shared across projects",

diff --git a/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal b/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal
@@ -41,7 +41,7 @@ library
                      , mtl
                      , QuickCheck
                      , sop-core
-                     , strict-containers
+                     , cardano-strict-containers
 
                      , cardano-ledger-alonzo
                      , cardano-ledger-alonzo-test

diff --git a/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal b/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal
@@ -54,7 +54,7 @@ library
                      , mtl
                      , nothunks
                      , serialise
-                     , strict-containers
+                     , cardano-strict-containers
                      , text
                      , transformers
                      , transformers-except

diff --git a/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal b/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal
@@ -40,7 +40,7 @@ library
                      , quiet             >=0.2   && <0.3
                      , mtl               >=2.2   && <2.3
                      , QuickCheck
-                     , strict-containers
+                     , cardano-strict-containers
                      , transformers
 
                        -- cardano-ledger-specs

diff --git a/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal b/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal
@@ -73,7 +73,7 @@ library
                      , nothunks
                      , orphans-deriving-via
                      , serialise         >=0.2   && <0.3
-                     , strict-containers
+                     , cardano-strict-containers
                      , text              >=1.2   && <1.3
                      , transformers
                      , vector-map

diff --git a/ouroboros-consensus-test/ouroboros-consensus-test.cabal b/ouroboros-consensus-test/ouroboros-consensus-test.cabal
@@ -103,7 +103,7 @@ library
                      , random
                      , serialise         >=0.2   && <0.3
                      , sop-core
-                     , strict-containers
+                     , cardano-strict-containers
                      , tasty
                      , tasty-golden
                      , tasty-quickcheck
@@ -254,7 +254,7 @@ test-suite test-storage
                      , quickcheck-state-machine >=0.7.0
                      , random
                      , serialise
-                     , strict-containers
+                     , cardano-strict-containers
                      , tasty
                      , tasty-hunit
                      , tasty-quickcheck

diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal
@@ -322,7 +322,7 @@ library
                      , sop-core          >=0.5   && <0.6
                      , stm               >=2.5   && <2.6
                      , streaming
-                     , strict-containers
+                     , cardano-strict-containers
                      , text              >=1.2   && <1.3
                      , these             >=1.1   && <1.2
                      , time

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -175,7 +175,7 @@ library
                        psqueues          >=0.2.3 && <0.3,
                        serialise         >=0.2   && <0.3,
                        random,
-                       strict-containers,
+                       cardano-strict-containers,
 
                        cardano-binary,
                        cardano-prelude,
@@ -211,7 +211,7 @@ library
   exposed-modules:     Ouroboros.Network.MockChain.Chain
                        Ouroboros.Network.MockChain.ProducerState
                        Ouroboros.Network.Testing.ConcreteBlock
-  build-depends:       hashable          >=1.2 && <1.4,
+  build-depends:       hashable          >= 1.4.1.0,
                        text              >=1.2 && <1.3,
                        time              >=1.9.1 && <1.11
 
@@ -254,7 +254,7 @@ library protocol-tests
                        QuickCheck,
                        quickcheck-instances,
                        serialise,
-                       strict-containers,
+                       cardano-strict-containers,
                        tasty,
                        tasty-quickcheck,
                        text,