From 5e3738c32741763db0fe86b44679e925a2b186b6 Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Fri, 19 Jul 2024 16:28:20 +0200 Subject: [PATCH] UTXO-HD 10.2 --- .github/workflows/haskell.yml | 13 ++++ cabal.project | 67 ++++++++++++++++++- .../Cardano/CLI/Run/Debug/LogEpochState.hs | 2 +- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 55d47df444..dddac8c001 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -72,6 +72,19 @@ jobs: with: use-sodium-vrf: true # default is true + - name: Linux install lmdb + if: matrix.sys.os == 'ubuntu-latest' + run: sudo apt install liblmdb-dev + + - name: Mac install lmdb + if: matrix.sys.os == 'macos-latest' + run: brew install lmdb + + - name: Windows install lmdb + if: matrix.sys.os == 'windows-latest' + shell: 'C:/msys64/usr/bin/bash.exe -e {0}' + run: /usr/bin/pacman --noconfirm -S mingw-w64-x86_64-lmdb + - uses: actions/checkout@v4 - name: Cabal update diff --git a/cabal.project b/cabal.project index 8d34ceba70..38ab755905 100644 --- a/cabal.project +++ b/cabal.project @@ -13,7 +13,7 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2024-12-24T12:56:48Z + , hackage.haskell.org 2025-01-14T03:16:27Z , cardano-haskell-packages 2025-01-15T09:59:24Z packages: @@ -60,3 +60,68 @@ write-ghc-environment-files: always -- Do NOT add more source-repository-package stanzas here unless they are strictly -- temporary! Please read the section in CONTRIBUTING about updating dependencies. +-- UTxO-HD for 10.2 +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-consensus + tag: c36e77c10628bcfbeaac07a9fa30d2280b88c13d + --sha256: sha256-7w9+A+rRJ1wCKkahVvclvSyvhzz8Hbmy3Jd15FV3sDI= + subdir: + ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-diffusion + ouroboros-consensus-protocol + sop-extras + strict-sop-core + +-- mempack support +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-base.git + tag: fb9b71f3bc33f8de673c6427736f09bf7972e81f + --sha256: sha256-ExQ497FDYlmQyZaXOTddU+KraAUHnTAqPiyt055v0+M= + subdir: + cardano-crypto-class + +-- mempack support +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-ledger + tag: 5e9799940b05af8b04812bc828b50a4848e17c93 + --sha256: sha256-G0pz2z1hvg32OBnrrhEgAomAs3liPrOsaslpSGR9nWM= + 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 + +-- UTxO-HD for 10.2 +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api.git + tag: 9b40fb26aeeca6461ca077661779e787592fe9e5 + --sha256: sha256-rUdoSlAv2et9ruZ6U54KYT0CVFcPCexKAj63QqUQdHs= + subdir: + cardano-api diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs b/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs index d89e8a5d09..bca2b576f1 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs +++ b/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs @@ -36,7 +36,7 @@ runLogEpochStateCmd Api.QuickValidation (EpochNo maxBound) () - ( \(AnyNewEpochState sbe nes) _ _ -> do + ( \(AnyNewEpochState sbe nes _) _ _ -> do liftIO $ LBS.appendFile outputFilePath $ shelleyBasedEraConstraints sbe (Aeson.encode nes) <> "\n"