Bump version of cardano-node

IntersectMBO · Jul 29, 2021 · 682f799 · 682f799
1 parent 4ef6caf
commit 682f799
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/cabal.project b/cabal.project
@@ -173,7 +173,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node.git
-  tag: f3ef4ed72894499160f2330b91572a159005c148
+  tag: f72c6272eb58a43cd1d2ef4f4381f3822b3c60c6
   subdir:
     cardano-api
     cardano-node

diff --git a/nix/pkgs/haskell/haskell.nix b/nix/pkgs/haskell/haskell.nix
@@ -52,7 +52,7 @@ let
       "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg";
       "https://github.com/input-output-hk/iohk-monitoring-framework"."34abfb7f4f5610cabb45396e0496472446a0b2ca" = "1fdc0a02ipa385dnwa6r6jyc8jlg537i12hflfglkhjs2b7i92gs";
       "https://github.com/input-output-hk/ouroboros-network"."e338f2cf8e1078fbda9555dd2b169c6737ef6774" = "12x81hpjyw2cpkazfalz6bw2wgr6ax7bnmlxl2rlfakkvsjfgaqd";
-      "https://github.com/input-output-hk/cardano-node.git"."f3ef4ed72894499160f2330b91572a159005c148" = "1mp8ih6kmq4j354mgjgrxlssv7jbk5zz1j3nyqg43ascql4d0fvq";
+      "https://github.com/input-output-hk/cardano-node.git"."f72c6272eb58a43cd1d2ef4f4381f3822b3c60c6" = "13q312z7q4avnkk0i5jl9g4idskdz3azq9xgm447ld8mwcvchdha";
       "https://github.com/input-output-hk/Win32-network"."94153b676617f8f33abe8d8182c37377d2784bd1" = "0pb7bg0936fldaa5r08nqbxvi2g8pcy4w3c7kdcg7pdgmimr30ss";
       "https://github.com/input-output-hk/hedgehog-extras"."8bcd3c9dc22cc44f9fcfe161f4638a384fc7a187" = "12viwpahjdfvlqpnzdgjp40nw31rvyznnab1hml9afpaxd6ixh70";
     };

diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix
diff --git a/plutus-contract/src/Plutus/Contract/CardanoAPI.hs b/plutus-contract/src/Plutus/Contract/CardanoAPI.hs
@@ -55,7 +55,11 @@ import qualified Plutus.V1.Ledger.Credential as Credential
 import qualified Plutus.V1.Ledger.Value      as Value
 import qualified PlutusCore.Data             as Data
 
-fromCardanoTx :: C.Era era => C.Tx era -> Either FromCardanoError P.Tx
+fromCardanoBlock :: C.BlockInMode mode -> Either FromCardanoError P.Block
+fromCardanoBlock (C.BlockInMode (C.Block (C.BlockHeader _ _ _) txs) _) =
+  traverse (fmap P.Valid . fromCardanoTx) txs
+
+fromCardanoTx :: C.Tx era -> Either FromCardanoError P.Tx
 fromCardanoTx (C.Tx (C.TxBody C.TxBodyContent{..}) _keyWitnesses) = do
     txOutputs <- traverse fromCardanoTxOut txOuts
     pure $ P.Tx