Build on ghc-9.2.4

binary/src/Cardano/Binary/FromCBOR.hs

@@ -26,7 +26,6 @@ import Codec.CBOR.ByteArray as BA
 import qualified Codec.CBOR.Read as CBOR.Read
 import qualified Data.ByteString.Lazy as BS.Lazy
 import qualified Data.ByteString.Short as SBS
-import qualified Data.ByteString.Short.Internal as SBS
 import qualified Data.Primitive.ByteArray as Prim
 import Data.ByteString.Short.Internal (ShortByteString (SBS))
 import Data.Fixed (Fixed(..), Nano, Pico)
@@ -479,10 +478,10 @@ instance FromCBOR UTCTime where
       (fromOrdinalDate year dayOfYear)
       (picosecondsToDiffTime timeOfDayPico)
 
--- | Convert an 'Either'-encoded failure to a 'cborg' decoder failure
-toCborError :: B.Buildable e => Either e a -> D.Decoder s a
-toCborError = either cborError pure
+-- -- | Convert an 'Either'-encoded failure to a 'cborg' decoder failure
+-- toCborError :: B.Buildable e => Either e a -> D.Decoder s a
+-- toCborError = either cborError pure
 
--- | Convert a @Buildable@ error into a 'cborg' decoder error
-cborError :: B.Buildable e => e -> D.Decoder s a
-cborError = fail . formatToString build
+-- -- | Convert a @Buildable@ error into a 'cborg' decoder error
+-- cborError :: B.Buildable e => e -> D.Decoder s a
+-- cborError = fail . formatToString build

cabal.project

@@ -1,4 +1,4 @@
-index-state: 2022-02-18T00:00:00Z
+index-state: 2022-09-10T00:00:00Z
 
 -- Ensures colourized output from tasty
 test-show-details: direct
@@ -22,19 +22,18 @@ package cardano-crypto
 
 source-repository-package
   type: git
-  location: https://github.com/erikd/canonical-json
-  tag: 38734cacc5b1f20428ee1991ba054627982a62d5
-  --sha256: 04h8n0m93rgr8xcynypjh6mc7kmb450c17cfvpyzpa36yld599fy
+  location: https://github.com/well-typed/canonical-json
+  tag: 8a37c22f0ce4759b4d534a4019a473e8225f3477
 
 source-repository-package
   type: git
-  location: https://github.com/erikd/nothunks
-  tag: be807ff5411a97c54e997706618c96bd686c2830
+  location: https://github.com/input-output-hk/nothunks
+  tag: 45d066c4f47400e645bda7dc0ffe5070bd2baf42
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: f3548c2bc620c8df4bc6e28830544f813ef533dc
+  tag: 891b93b4121d26437d60625b6e212c51392acbea
   --sha256: 04h8n0m93rgr8xcynypjh6mc7kmb450c17cfvpyzpa36yld599fy
   subdir:
     cardano-prelude
@@ -48,6 +47,41 @@ source-repository-package
 
 allow-newer:
   *:base,
+  *:basement,
   *:containers,
-  *:ghc-prim,
+--  *:ghc-prim,
+  *:memory,
   *:protolude,
+
+source-repository-package
+  type: git
+  location: https://github.com/protolude/protolude
+  tag: cd83ebec004a6d44b60a2c87e13759365ff2d9a5
+
+source-repository-package
+  type: git
+  location: https://github.com/well-typed/cborg
+  tag: c31a1c007a00dc1c393580e7702a9ac6b73b8225
+  subdir:
+    cborg
+    serialise
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell-foundation/foundation
+  tag: 39985b94b4de4d02e8decb5e378b53ad3f72c0cc
+  subdir:
+    basement
+
+package process
+  ghc-options: -Wno-error
+--  tests: False
+
+-- source-repository-package
+--   type: git
+--   location: https://github.com/newhoggy/process
+--   tag: f20cf8fa19dc9c63f3490135f1b652e4d95a0cd5
+--   post-checkout-command: autoreconf -i
+
+package cardano-crypto-class
+  ghc-options: -Wno-unused-packages

cardano-crypto-class/src/Cardano/Crypto/Hash/Class.hs

@@ -1,10 +1,12 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskellQuotes #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE ViewPatterns #-}
@@ -89,6 +91,8 @@ import Cardano.Prelude (HeapWords (..))
 
 import qualified Data.ByteString.Short.Internal as SBSI
 
+import Cardano.Crypto.Util (decodeHexString)
+
 class (KnownNat (SizeHash h), Typeable h) => HashAlgorithm h where
   --TODO: eliminate this Typeable constraint needed only for the ToCBOR
   -- the ToCBOR should not need it either
@@ -144,6 +148,7 @@ pattern UnsafeHash :: forall h a. HashAlgorithm h => ShortByteString -> Hash h a
 pattern UnsafeHash bytes <- UnsafeHashRep (unpackBytes -> bytes)
   where
   UnsafeHash bytes =
+
     case hashFromBytesShort bytes of
       Nothing ->
         error "UnsafeHash: mismatched size of the supplied ShortByteString and the expected digest"

cardano-crypto-class/src/Cardano/Crypto/PinnedSizedBytes.hs

@@ -1,10 +1,12 @@
 {-# LANGUAGE BangPatterns               #-}
 {-# LANGUAGE DerivingVia                #-}
 {-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE MagicHash                  #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
+{-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE UnboxedTuples              #-}
 
 -- for pinnedByteArrayFromListN
@@ -65,6 +67,8 @@ import qualified Data.ByteString as BS
 import Cardano.Foreign
 import Cardano.Crypto.Libsodium.C (c_sodium_compare)
 
+import Cardano.Crypto.Util (decodeHexString)
+
 {- HLINT ignore "Reduce duplication" -}
 
 -- $setup

cardano-crypto-class/src/Cardano/Crypto/Util.hs

@@ -24,15 +24,26 @@ module Cardano.Crypto.Util
 
   -- * ByteString manipulation
   , slice
+
+  -- * Base16 conversion
+  , decodeHexByteString
+  , decodeHexString
+  , decodeHexStringQ
   )
 where
 
+import           Control.Monad (unless)
+import           Data.Bifunctor (first)
+import           Data.Char (isAscii)
 import           Data.Word
 import           Numeric.Natural
 import           Data.Bits
 import qualified Data.ByteString as BS
+import qualified Data.ByteString.Char8 as BSC8
 import qualified Data.ByteString.Internal as BS
 import           Data.ByteString (ByteString)
+import           Data.ByteString.Base16 as BS16
+import           Language.Haskell.TH
 
 import           GHC.Exts (Addr#, Int#, Word#)
 import qualified GHC.Exts    as GHC
@@ -151,3 +162,32 @@ slice :: Word -> Word -> ByteString -> ByteString
 slice offset size = BS.take (fromIntegral size)
                   . BS.drop (fromIntegral offset)
 
+-- | Decode base16 ByteString, while ensuring expected length.
+decodeHexByteString :: ByteString -> Int -> Either String ByteString
+decodeHexByteString bsHex lenExpected = do
+  bs <- first ("Malformed hex: " ++) $ BS16.decode bsHex
+  let lenActual = BS.length bs
+  unless (lenExpected == lenActual) $
+    Left $ "Expected in decoded form to be: " ++
+           show lenExpected ++ " bytes, but got: " ++ show lenActual
+  pure bs
+
+
+-- | Decode base16 String, while ensuring expected length. Unlike
+-- `decodeHexByteString` this function expects a '0x' prefix.
+decodeHexString :: String -> Int -> Either String ByteString
+decodeHexString hexStr' lenExpected = do
+  let hexStr =
+        case hexStr' of
+          '0':'x':str -> str
+          str -> str
+  unless (all isAscii hexStr) $ Left $ "Input string contains invalid characters: " ++ hexStr
+  decodeHexByteString (BSC8.pack hexStr) lenExpected
+
+-- | Decode a `String` with Hex characters, while ensuring expected length.
+decodeHexStringQ :: String -> Int -> Q Exp
+decodeHexStringQ hexStr n = do
+  case decodeHexString hexStr n of
+    Left err -> fail $ "<decodeHexByteString>: " ++ err
+    Right _  -> [| either error id (decodeHexString hexStr n) |]
+

heapwords/LICENSE

@@ -0,0 +1,53 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. 
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS