Skip to content

Commit f614a51

Browse files
authored
Merge pull request #1068 from IntersectMBO/bump-cardano-api-10.9.0.0
Bump `cardano-api` to 10.9.0.0
2 parents bb8b3b9 + 1c89380 commit f614a51

File tree

24 files changed

+30
-32
lines changed

24 files changed

+30
-32
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2024-12-24T12:56:48Z
17-
, cardano-haskell-packages 2025-02-11T21:18:23Z
17+
, cardano-haskell-packages 2025-02-15T18:39:38Z
1818

1919
packages:
2020
cardano-cli

cardano-cli/cardano-cli.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ library
219219
binary,
220220
bytestring,
221221
canonical-json,
222-
cardano-api ^>=10.8,
222+
cardano-api ^>=10.9,
223223
cardano-binary,
224224
cardano-crypto,
225225
cardano-crypto-class ^>=2.1.2,
@@ -325,7 +325,7 @@ test-suite cardano-cli-test
325325
base16-bytestring,
326326
bech32 >=1.1.0,
327327
bytestring,
328-
cardano-api:{cardano-api, gen, internal},
328+
cardano-api:{cardano-api, gen},
329329
cardano-cli,
330330
cardano-cli:cardano-cli-test-lib,
331331
cardano-slotting,

cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ import Cardano.CLI.Types.Governance
3737
import Cardano.CLI.Types.TxFeature
3838

3939
import Data.Bifunctor (first)
40-
import Data.Foldable
40+
import Data.Foldable hiding (toList)
4141
import Data.Function
4242
import qualified Data.Map.Strict as Map
4343
import Data.Maybe
4444
import Data.Text (Text)
45+
import GHC.Exts (toList)
4546
import Options.Applicative
4647
import qualified Options.Applicative as Opt
4748

@@ -294,8 +295,8 @@ runCompatibleTransactionCmd
294295

295296
proposalsRefInputs =
296297
[ refInput
297-
| ProposalProcedures _ (TxProposalProcedures _ (BuildTxWith proposalMap)) <- [protocolUpdates]
298-
, sWit <- Map.elems proposalMap
298+
| ProposalProcedures _ (TxProposalProcedures proposalMap) <- [protocolUpdates]
299+
, BuildTxWith (Just sWit) <- map snd $ toList proposalMap
299300
, refInput <- maybeToList $ getScriptWitnessReferenceInput sWit
300301
]
301302

cardano-cli/src/Cardano/CLI/Orphans.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ instance ToJSON HashableScriptData where
3232
[ "hash" .= hashScriptDataBytes hsd
3333
, "json" .= scriptDataToJsonDetailedSchema hsd
3434
]
35-
36-
-- TODO move LocalNodeConnectInfo instances to cardano-api
37-
deriving instance Show LocalNodeConnectInfo
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "Witnessed Tx AlonzoEra",
2+
"type": "Tx AlonzoEra",
33
"description": "Ledger Cddl Format",
44
"cborHex": "84a30081825820f62cd7bc15d8c6d2c8519fb8d13c57c0157ab6bab50af62bc63706feb966393d0001828258390076619da7963eaa588252c45e960667a4647eed69135f51f5a10f2888d2c20ac07056fc8899c47d825cefd9dcf5efba150236e043262e2b431b0000011764f7be0782581d604088059bbeb6add02eecd0c6a2a52c06910f2a6b4ba0029e9fe6ed131a00989680021a00028b79a100818258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea4234275840043220211a264209f6e61903e60e80093b7b3a08e8bc5fe8f8707635acd69b6e0589e61aea544b87729983955decded90a59f9701042bebe57f2afba7c94fc02f5f6"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "Unwitnessed Tx ConwayEra",
2+
"type": "Tx ConwayEra",
33
"description": "Ledger Cddl Format",
44
"cborHex": "84a500d9010281825820f62cd7bc15d8c6d2c8519fb8d13c57c0157ab6bab50af62bc63706feb966393d0001828258390076619da7963eaa588252c45e960667a4647eed69135f51f5a10f2888d2c20ac07056fc8899c47d825cefd9dcf5efba150236e043262e2b431b0000011764f7be0782581d604088059bbeb6add02eecd0c6a2a52c06910f2a6b4ba0029e9fe6ed131a00989680021a00028b791519021f161a000f4397a0f5f6"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "Witnessed Tx ConwayEra",
2+
"type": "Tx ConwayEra",
33
"description": "Ledger Cddl Format",
44
"cborHex": "84a5008182582054b5f2d5ed0fa142e724c9a982864d9e080b10648a66c8f7956eb3cc2cf16c0000018182581d6052e63f22c5107ed776b70f7b92248b02552fd08f3e747bc7450994411b0000000235cfef6d021a0002ff51031a0099d1dd04828a03581ce6eb963e591bc66401b5e1c763f4c9bc27adf58eb720f63c809981d75820dacc52f2d73542ab0fc3b1f8051d00b0e50f1130935e5a21982bd289705852ae1b000000174876e8001b00000002540be400d81e82010a581de05e35891efec9c4a4e08d2a6a6d03598056d014e287618548e2556f8c81581c5e35891efec9c4a4e08d2a6a6d03598056d014e287618548e2556f8c818400190bb9447f000001f682783268747470733a2f2f6d792d69702e61742f746573742f636f6e77617974657374706f6f6c2e6d657461646174612e6a736f6e58207cd083e6682892afc2b4e315fca93784f43dccde8bae1daa81db0b587e27155f83028200581c5e35891efec9c4a4e08d2a6a6d03598056d014e287618548e2556f8c581ce6eb963e591bc66401b5e1c763f4c9bc27adf58eb720f63c809981d7a100d9010281825820c16f6bf723e38013f88588539fbbf1cd6b57bbbd8bb2cf318e641f00dcd527875840e62f3050bf7ee1d1547badd6f8346c00957b20c8d8f201fc8cf9d64485b3b3c944392afe00619516a00d98c6ccfa44a7de8c1a093efdc10832bb6fdf4cde8e08f5f6"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "Witnessed Tx ConwayEra",
2+
"type": "Tx ConwayEra",
33
"description": "Ledger Cddl Format",
44
"cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d90102818258200a9d35aa5299580a67b1e43a3a4b6d43ef29c94e56c51ce4c17e9a53c1d0f39a58400598eecd84e9467182b4b027d1d30f0ba54b84367042e805bd817644d5f7905bc5c27c99c4f403226c069d972c8e1ad9adfd1b4945345b65b339cdfa6ae46100f5f6"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "Witnessed Tx ConwayEra",
2+
"type": "Tx ConwayEra",
33
"description": "Ledger Cddl Format",
44
"cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d9010281825820f010c4332699c6ea1e43b427919860277169382d43d2969b28a110cfa08d955c584053eb4711d6cf2c9985c36e32d4bdfada2de85fc7c7ad1ac3a8ecb69843f5bc1897acca423934ac9596bf7eeb3e5ab33a43de895e17e786ae3e6df840e8097802f5f6"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "Witnessed Tx ConwayEra",
2+
"type": "Tx ConwayEra",
33
"description": "Ledger Cddl Format",
44
"cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d9010281825820b18eacea2003b68e39137545e9d42ce5bca133ca0334d6a75aa9cb1fd02be7ec5840051079704c9d41192356287965e189d9fe7f693693a72a454f34e6f1c27c5523fe4c8b841931a6d7bb0f59d09b0dcc406834f990845e115a7329ef4285d38208f5f6"
55
}

0 commit comments

Comments
 (0)