Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump cardano-api to 10.9.0.0 #1068

Merged
merged 5 commits into from
Feb 17, 2025
Merged

Bump cardano-api to 10.9.0.0 #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f37ee3a
Update golden files to new format
palas Feb 4, 2025
afca5c9
Bump `cardano-api` version to 10.9
palas Feb 17, 2025
681b72d
Merge branch 'remove-deprecated-functions'
palas Feb 17, 2025
9e26321
Update golden file
palas Feb 17, 2025
1c89380
Use `OMap` stored order
palas Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repository cardano-haskell-packages
-- you need to run if you change them
index-state:
, hackage.haskell.org 2024-12-24T12:56:48Z
, cardano-haskell-packages 2025-02-11T21:18:23Z
, cardano-haskell-packages 2025-02-15T18:39:38Z

packages:
cardano-cli
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/cardano-cli.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ library
binary,
bytestring,
canonical-json,
cardano-api ^>=10.8,
cardano-api ^>=10.9,
cardano-binary,
cardano-crypto,
cardano-crypto-class ^>=2.1.2,
Expand Down Expand Up @@ -325,7 +325,7 @@ test-suite cardano-cli-test
base16-bytestring,
bech32 >=1.1.0,
bytestring,
cardano-api:{cardano-api, gen, internal},
cardano-api:{cardano-api, gen},
cardano-cli,
cardano-cli:cardano-cli-test-lib,
cardano-slotting,
Expand Down
7 changes: 4 additions & 3 deletions cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ import Cardano.CLI.Types.Governance
import Cardano.CLI.Types.TxFeature

import Data.Bifunctor (first)
import Data.Foldable
import Data.Foldable hiding (toList)
import Data.Function
import qualified Data.Map.Strict as Map
import Data.Maybe
import Data.Text (Text)
import GHC.Exts (toList)
import Options.Applicative
import qualified Options.Applicative as Opt

Expand Down Expand Up @@ -294,8 +295,8 @@ runCompatibleTransactionCmd

proposalsRefInputs =
[ refInput
| ProposalProcedures _ (TxProposalProcedures _ (BuildTxWith proposalMap)) <- [protocolUpdates]
, sWit <- Map.elems proposalMap
| ProposalProcedures _ (TxProposalProcedures proposalMap) <- [protocolUpdates]
, BuildTxWith (Just sWit) <- map snd $ toList proposalMap
, refInput <- maybeToList $ getScriptWitnessReferenceInput sWit
]

Expand Down
3 changes: 0 additions & 3 deletions cardano-cli/src/Cardano/CLI/Orphans.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,3 @@ instance ToJSON HashableScriptData where
[ "hash" .= hashScriptDataBytes hsd
, "json" .= scriptDataToJsonDetailedSchema hsd
]

-- TODO move LocalNodeConnectInfo instances to cardano-api
deriving instance Show LocalNodeConnectInfo
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/alonzo/tx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx AlonzoEra",
"type": "Tx AlonzoEra",
"description": "Ledger Cddl Format",
"cborHex": "84a30081825820f62cd7bc15d8c6d2c8519fb8d13c57c0157ab6bab50af62bc63706feb966393d0001828258390076619da7963eaa588252c45e960667a4647eed69135f51f5a10f2888d2c20ac07056fc8899c47d825cefd9dcf5efba150236e043262e2b431b0000011764f7be0782581d604088059bbeb6add02eecd0c6a2a52c06910f2a6b4ba0029e9fe6ed131a00989680021a00028b79a100818258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea4234275840043220211a264209f6e61903e60e80093b7b3a08e8bc5fe8f8707635acd69b6e0589e61aea544b87729983955decded90a59f9701042bebe57f2afba7c94fc02f5f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/conway/build-raw-out.tx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx ConwayEra",
"type": "Tx ConwayEra",
"description": "Ledger Cddl Format",
"cborHex": "84a500d9010281825820f62cd7bc15d8c6d2c8519fb8d13c57c0157ab6bab50af62bc63706feb966393d0001828258390076619da7963eaa588252c45e960667a4647eed69135f51f5a10f2888d2c20ac07056fc8899c47d825cefd9dcf5efba150236e043262e2b431b0000011764f7be0782581d604088059bbeb6add02eecd0c6a2a52c06910f2a6b4ba0029e9fe6ed131a00989680021a00028b791519021f161a000f4397a0f5f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/conway/transaction/assemble_out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx ConwayEra",
"type": "Tx ConwayEra",
"description": "Ledger Cddl Format",
"cborHex": "84a5008182582054b5f2d5ed0fa142e724c9a982864d9e080b10648a66c8f7956eb3cc2cf16c0000018182581d6052e63f22c5107ed776b70f7b92248b02552fd08f3e747bc7450994411b0000000235cfef6d021a0002ff51031a0099d1dd04828a03581ce6eb963e591bc66401b5e1c763f4c9bc27adf58eb720f63c809981d75820dacc52f2d73542ab0fc3b1f8051d00b0e50f1130935e5a21982bd289705852ae1b000000174876e8001b00000002540be400d81e82010a581de05e35891efec9c4a4e08d2a6a6d03598056d014e287618548e2556f8c81581c5e35891efec9c4a4e08d2a6a6d03598056d014e287618548e2556f8c818400190bb9447f000001f682783268747470733a2f2f6d792d69702e61742f746573742f636f6e77617974657374706f6f6c2e6d657461646174612e6a736f6e58207cd083e6682892afc2b4e315fca93784f43dccde8bae1daa81db0b587e27155f83028200581c5e35891efec9c4a4e08d2a6a6d03598056d014e287618548e2556f8c581ce6eb963e591bc66401b5e1c763f4c9bc27adf58eb720f63c809981d7a100d9010281825820c16f6bf723e38013f88588539fbbf1cd6b57bbbd8bb2cf318e641f00dcd527875840e62f3050bf7ee1d1547badd6f8346c00957b20c8d8f201fc8cf9d64485b3b3c944392afe00619516a00d98c6ccfa44a7de8c1a093efdc10832bb6fdf4cde8e08f5f6"
}
2 changes: 1 addition & 1 deletion ...ano-cli/test/cardano-cli-golden/files/golden/governance/committee/tx.cold.extended.signed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx ConwayEra",
"type": "Tx ConwayEra",
"description": "Ledger Cddl Format",
"cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d90102818258200a9d35aa5299580a67b1e43a3a4b6d43ef29c94e56c51ce4c17e9a53c1d0f39a58400598eecd84e9467182b4b027d1d30f0ba54b84367042e805bd817644d5f7905bc5c27c99c4f403226c069d972c8e1ad9adfd1b4945345b65b339cdfa6ae46100f5f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/tx.hot.extended.signed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx ConwayEra",
"type": "Tx ConwayEra",
"description": "Ledger Cddl Format",
"cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d9010281825820f010c4332699c6ea1e43b427919860277169382d43d2969b28a110cfa08d955c584053eb4711d6cf2c9985c36e32d4bdfada2de85fc7c7ad1ac3a8ecb69843f5bc1897acca423934ac9596bf7eeb3e5ab33a43de895e17e786ae3e6df840e8097802f5f6"
}
2 changes: 1 addition & 1 deletion ...o-cli/test/cardano-cli-golden/files/golden/governance/drep/extended-key-signing/tx.signed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx ConwayEra",
"type": "Tx ConwayEra",
"description": "Ledger Cddl Format",
"cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d9010281825820b18eacea2003b68e39137545e9d42ce5bca133ca0334d6a75aa9cb1fd02be7ec5840051079704c9d41192356287965e189d9fe7f693693a72a454f34e6f1c27c5523fe4c8b841931a6d7bb0f59d09b0dcc406834f990845e115a7329ef4285d38208f5f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a300818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181825839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf1864020ca0f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a400818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181825839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf1864020c048182018200581cd0efd9836e62225a47baf9bedfeaccbb86ba3f49d9edc4ac0aa26df5a101818202868200581cd92b712d1882c3b0f75b6f677e0b2cbef4fbc8b8121bb9dde324ff098200581c4d780ed1bfc88cbd4da3f48de91fe728c3530d662564bf5a284b53218200581c3a94d6d4e786a3f5d439939cafc0536f6abc324fb8404084d6034bf88200581cb12e094d1db7c0fba5121f22db193d0060efed8be43654f861bb68ae8200581c9be49d56442b4b8b16cab4e43e238bbdefc6c803d554c82fcd5facc38200581c622be5fab3b5c3f371a50a535e4d3349c942a98cecee93b24e2fd11df6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a400818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181825839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf821864a1581c69596718df8203759c0f9e86f3f79d1dd45bc9d34109a4fccc824e02a148657468657265756d1832020c09a1581c69596718df8203759c0f9e86f3f79d1dd45bc9d34109a4fccc824e02a148657468657265756d1832a101818202868200581cd92b712d1882c3b0f75b6f677e0b2cbef4fbc8b8121bb9dde324ff098200581c4d780ed1bfc88cbd4da3f48de91fe728c3530d662564bf5a284b53218200581c3a94d6d4e786a3f5d439939cafc0536f6abc324fb8404084d6034bf88200581cb12e094d1db7c0fba5121f22db193d0060efed8be43654f861bb68ae8200581c9be49d56442b4b8b16cab4e43e238bbdefc6c803d554c82fcd5facc38200581c622be5fab3b5c3f371a50a535e4d3349c942a98cecee93b24e2fd11df6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a400818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181825839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf1864020c05a1581de181b4245f84593f63c0ff2296930254f77a0690fa9de5f969cac27cb01864a101818202868200581cd92b712d1882c3b0f75b6f677e0b2cbef4fbc8b8121bb9dde324ff098200581c4d780ed1bfc88cbd4da3f48de91fe728c3530d662564bf5a284b53218200581c3a94d6d4e786a3f5d439939cafc0536f6abc324fb8404084d6034bf88200581cb12e094d1db7c0fba5121f22db193d0060efed8be43654f861bb68ae8200581c9be49d56442b4b8b16cab4e43e238bbdefc6c803d554c82fcd5facc38200581c622be5fab3b5c3f371a50a535e4d3349c942a98cecee93b24e2fd11df6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a300818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181825839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf1864020ca101818202868200581cd92b712d1882c3b0f75b6f677e0b2cbef4fbc8b8121bb9dde324ff098200581c4d780ed1bfc88cbd4da3f48de91fe728c3530d662564bf5a284b53218200581c3a94d6d4e786a3f5d439939cafc0536f6abc324fb8404084d6034bf88200581cb12e094d1db7c0fba5121f22db193d0060efed8be43654f861bb68ae8200581c9be49d56442b4b8b16cab4e43e238bbdefc6c803d554c82fcd5facc38200581c622be5fab3b5c3f371a50a535e4d3349c942a98cecee93b24e2fd11df6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx BabbageEra",
"type": "Tx BabbageEra",
"description": "Ledger Cddl Format",
"cborHex": "84a300818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181a3005839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf011864028201d81842182a020ca0f5f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/stake-address/build-raw-out.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Unwitnessed Tx ConwayEra",
"type": "Tx ConwayEra",
"description": "Ledger Cddl Format",
"cborHex": "84a400d9010281825820bdfa7d91a29ffe071c028c0143c5d278c0a7ddb829c1e95f54a1676915fd82c2000180020104d901028183078200581c81b4245f84593f63c0ff2296930254f77a0690fa9de5f969cac27cb01a001e8480a0f5f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a4008182582091999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c300018182581d615dbe1e2117641f8d618034b801a870ca731ce758c3bedd5c7e4429c11a05f5e100021a000f4240031a0007a120a100818258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea42342758409f69aa4bf41acf78deaffb002c4f36157f3bad7c434a19b1ffe7e7df5f98f629e58503a762e83c1f60e54c9eb7eef9885b16c2b42ce1336914f2df9aa63b1407f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a4008182582091999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c300018182581d615dbe1e2117641f8d618034b801a870ca731ce758c3bedd5c7e4429c11a05f5e100021a000f4240031a0007a120a100838258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea42342758409f69aa4bf41acf78deaffb002c4f36157f3bad7c434a19b1ffe7e7df5f98f629e58503a762e83c1f60e54c9eb7eef9885b16c2b42ce1336914f2df9aa63b1407825820bd07998bca8de945482d950a3051f0e4d18afedecbc08d4c99c23f1804f3c8e5584005aa65cbc59470743670086a4a769b6ec66db7f1e587b8be962660a32d94a9d25bb38732e3cea546c9b1bfb86bc2c30b9f0c6319a0a838d06e2597836aa215098258200ef55ad974b238209f51d0eed5ffbb00220a9811c0481eaf127ceb1c525f1eb658401712b3dda8b356303ec1689062c0c829ba3ae05c125f988fd87f4a23c0bc32f6ed7e18b5b4bb882e0fa952b8c982a606e3b611ca34cca938403c69165d78bb07f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign-3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Witnessed Tx MaryEra",
"type": "Tx MaryEra",
"description": "Ledger Cddl Format",
"cborHex": "83a4008182582091999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c300018182581d615dbe1e2117641f8d618034b801a870ca731ce758c3bedd5c7e4429c11a05f5e100021a000f4240031a0007a120a100818258202b35e914764560fcf7655523d303d8cf27fc8306b6e86891802feedcfa087715584045b312c96ff0f453a387c49be271ca91ddfd724b81ee4511f1d5c3bab27a6d2705b96426c9d3ad717f1ad116c7b8c3d7bebefb5453931ad7e72a4a09b9373205f6"
}
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
module Test.Cli.AddCostModels where

import Cardano.Api
import Cardano.Api.Internal.ProtocolParameters
import Cardano.Api.Ledger (StrictMaybe (..))
import qualified Cardano.Api.Ledger as L
import Cardano.Api.ProtocolParameters

import Cardano.CLI.EraBased.Run.Governance.Actions

Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-test/Test/Cli/FilePermissions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Test.Cli.FilePermissions
where

import Cardano.Api
import Cardano.Api.IO (checkVrfFilePermissions)
import Cardano.Api.Internal.IO (checkVrfFilePermissions)

import Control.Monad (void)

Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Compatible/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

module Test.Cli.Shelley.Transaction.Compatible.Build where

import Cardano.Api.Eras
import Cardano.Api.Pretty
import Cardano.Api.Internal.Eras
import Cardano.Api.Internal.Pretty

import Control.Monad.Catch (MonadCatch)
import Control.Monad.IO.Class
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading