Merge remote-tracking branch 'origin/master' into jordan/10.6-node-release

Author: ana-pantilie

.github/workflows/github-page.yml

@@ -1,4 +1,4 @@
-name: "Haddock documentation"
+name: "Update github pages"
 
 on:
   push:
@@ -34,27 +34,34 @@ jobs:
         run: |
           cabal build all
 
-      - name: Build documentation
+      - name: Build haddock documentation
         run: |
-          cabal haddock-project --output=./haddocks --internal --foreign-libraries
+          mkdir website
+          cabal haddock-project --output=./website --internal --foreign-libraries
 
-      - name: Compress haddocks
+      - name: Build typedoc documentation
         run: |
-          tar -czf haddocks.tgz -C haddocks .
+          nix build .#wasm-typedoc
+          mkdir -p website/cardano-wasm/typedoc
+          cp -r result/. website/cardano-wasm/typedoc/
 
-      - name: Upload haddocks artifact
+      - name: Compress website
+        run: |
+          tar -czf website.tgz -C website .
+
+      - name: Upload website artifact
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         continue-on-error: true
         with:
-          name: haddocks
-          path: ./haddocks.tgz
+          name: website
+          path: ./website.tgz
 
       - name: Deploy documentation to gh-pages 🚀
         if: github.ref == 'refs/heads/master'
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN || github.token }}
-          publish_dir: haddocks
+          publish_dir: website
           cname: cardano-api.cardano.intersectmbo.org
           force_orphan: true

.github/workflows/haskell-wasm.yml

@@ -144,8 +144,8 @@ jobs:
 
     - name: Prepare example
       run: |
-        cp $(env -u CABAL_CONFIG wasm32-wasi-cabal list-bin exe:cardano-wasm | tail -n1) cardano-wasm/examples/basic/
-        $(wasm32-wasi-ghc --print-libdir)/post-link.mjs -i "$(env -u CABAL_CONFIG wasm32-wasi-cabal list-bin exe:cardano-wasm | tail -n1)" -o cardano-wasm/examples/basic/cardano-wasm.js
+        cp $(env -u CABAL_CONFIG wasm32-wasi-cabal list-bin exe:cardano-wasm | tail -n1) cardano-wasm/lib-wrapper/
+        $(wasm32-wasi-ghc --print-libdir)/post-link.mjs -i "$(env -u CABAL_CONFIG wasm32-wasi-cabal list-bin exe:cardano-wasm | tail -n1)" -o cardano-wasm/lib-wrapper/cardano-wasm.js
         cp cardano-wasm/lib-wrapper/* cardano-wasm/examples/basic/
 
     - uses: rrbutani/use-nix-shell-action@v1
@@ -181,6 +181,18 @@ jobs:
     #  with:
     #     limit-access-to-actor: true
 
+    - name: Build grpc bridge
+      run: |
+        nix build .#proto-js-bundle
+        cp result/cardano_node_grpc_web_pb.js cardano-wasm/lib-wrapper/
+
+    - name: Upload built wasm library
+      uses: actions/upload-artifact@v4
+      with:
+        name: cardano-wasm
+        path: cardano-wasm/lib-wrapper/*
+        compression-level: 9
+
   wasm-builds-complete:
     needs: [build]
     if: ${{ always() }}

.github/workflows/hls.yml

@@ -17,7 +17,7 @@ jobs:
       HLS_CACHE_VERSION: "2025-09-23"
 
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 90
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -79,6 +79,7 @@ cardano-wasm/examples/*/cardano-wasm.wasm
 cardano-wasm/examples/*/cardano-wasm.js
 cardano-wasm/examples/*/*.d.ts
 cardano-wasm/examples/*/cardano-api.js
+cardano-wasm/examples/*/main.js
 cardano-wasm/examples/*/cardano_node_grpc_web_pb.js
 .ghc-wasm/
 

.hlint.yaml

@@ -57,6 +57,12 @@
 # - ignore: {name: Use let}
 # - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
 
+# Allow snake_case naming in test modules (following Haskell test property convention)
+- ignore: {name: Use camelCase, within: [Test.Cardano.Api.**, Test.Golden.Cardano.Api.**]}
+
+- ignore: {name: Eta reduce}
+- ignore: {name: Use + directly}
+- ignore: {name: Use fmap}
 
 # Define some custom infix operators
 # - fixity: infixr 3 ~^#^~

cabal.project

@@ -28,7 +28,6 @@ extra-packages: Cabal, process
 if impl(ghc < 9.8)
   constraints: interpolatedstring-perl6:setup.time source
 
-
 -- It may slow down build plan preparation, but without it cabal has problems
 -- with solving constraints. Remove this when not needed anymore.
 max-backjumps: 50000

cardano-api/gen/Test/Hedgehog/Roundtrip/CBOR.hs

@@ -23,8 +23,6 @@ import GHC.Stack qualified as GHC
 import Hedgehog qualified as H
 import Hedgehog.Internal.Property (failWith)
 
-{- HLINT ignore "Use camelCase" -}
-
 -- | Assert that CBOR serialisation and deserialisation roundtrips.
 trippingCbor
   :: ()

cardano-api/src/Cardano/Api/Address.hs

@@ -9,8 +9,6 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
-{- HLINT ignore "Avoid lambda using `infix`" -}
-
 -- | Cardano addresses: payment and stake addresses.
 module Cardano.Api.Address
   ( -- * Payment addresses
@@ -55,6 +53,7 @@ module Cardano.Api.Address
   , StakeExtendedKey
 
     -- * Conversion functions
+  , shelleyPayAddrToPaymentKeyHash
   , shelleyPayAddrToPlutusPubKHash
 
     -- * Internal conversion functions
@@ -115,6 +114,7 @@ import Data.Bifunctor (first)
 import Data.ByteString.Base58 qualified as Base58
 import Data.Char (isAsciiLower, isAsciiUpper, isDigit)
 import Data.Either.Combinators (rightToMaybe)
+import Data.Maybe (isJust)
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Text.Encoding qualified as Text
@@ -614,10 +614,13 @@ makeStakeAddress nw sc =
 -- | Is the UTxO at the address only spendable via a key witness.
 isKeyAddress :: AddressInEra era -> Bool
 isKeyAddress (AddressInEra ByronAddressInAnyEra _) = True
-isKeyAddress (AddressInEra (ShelleyAddressInEra _) (ShelleyAddress _ pCred _)) =
+isKeyAddress (AddressInEra (ShelleyAddressInEra _) addr) = isJust $ shelleyPayAddrToPaymentKeyHash addr
+
+shelleyPayAddrToPaymentKeyHash :: Address ShelleyAddr -> Maybe (Hash PaymentKey)
+shelleyPayAddrToPaymentKeyHash (ShelleyAddress _ pCred _) =
   case fromShelleyPaymentCredential pCred of
-    PaymentCredentialByKey _ -> True
-    PaymentCredentialByScript _ -> False
+    PaymentCredentialByKey key -> Just key
+    PaymentCredentialByScript _ -> Nothing
 
 -- | Converts a Shelley payment address to a Plutus public key hash.
 shelleyPayAddrToPlutusPubKHash :: Address ShelleyAddr -> Maybe PlutusAPI.PubKeyHash

cardano-api/src/Cardano/Api/Block.hs

@@ -81,9 +81,6 @@ import Data.ByteString.Short qualified as SBS
 import Data.Foldable (Foldable (toList))
 import Data.Text (Text)
 
-{- HLINT ignore "Use lambda" -}
-{- HLINT ignore "Use lambda-case" -}
-
 -- ----------------------------------------------------------------------------
 -- Blocks in an era
 --

cardano-api/src/Cardano/Api/Byron/Internal/Proposal.hs

@@ -57,12 +57,11 @@ import Ouroboros.Consensus.Byron.Ledger.Mempool qualified as Mempool
 
 import Data.ByteString (ByteString)
 import Data.ByteString.Lazy qualified as LB
+import Data.Functor (void)
 import Data.Map.Strict qualified as M
 import Data.Word
 import Numeric.Natural
 
-{- HLINT ignore "Use void" -}
-
 -- | Byron era update proposal
 newtype ByronUpdateProposal
   = ByronUpdateProposal {unByronUpdateProposal :: AProposal ByteString}
@@ -193,7 +192,7 @@ instance HasTypeProxy ByronVote where
   proxyToAsType _ = AsByronVote
 
 instance SerialiseAsRawBytes ByronVote where
-  serialiseToRawBytes (ByronVote vote) = Binary.serialize' $ fmap (const ()) vote
+  serialiseToRawBytes (ByronVote vote) = Binary.serialize' $ void vote
   deserialiseFromRawBytes AsByronVote bs =
     let lBs = LB.fromStrict bs
      in case Binary.decodeFull lBs of