From c1d12067fa54d66e36bea7eda587d61dbbf27982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Tue, 2 Jan 2024 17:45:25 +0100 Subject: [PATCH 1/3] Update cardano-api to 8.37.0.0 --- cabal.project | 2 +- cardano-cli/cardano-cli.cabal | 2 +- flake.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index 352e008b88..b9d7b80324 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2023-12-16T11:21:56Z - , cardano-haskell-packages 2023-12-06T18:36:58Z + , cardano-haskell-packages 2024-01-02T14:28:21Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 5d5823cdf4..2eb3045a6a 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -196,7 +196,7 @@ library , binary , bytestring , canonical-json - , cardano-api ^>= 8.36.1.1 + , cardano-api ^>= 8.37.0.0 , cardano-binary , cardano-crypto , cardano-crypto-class ^>= 2.1.2 diff --git a/flake.lock b/flake.lock index 1660938ec7..0f40d662e5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1701888566, - "narHash": "sha256-ew8qcUwIqiq3kLdbyL1KX1qWhylWaiWwCqTxbl30JgY=", + "lastModified": 1704207160, + "narHash": "sha256-vvm56KzA6jEkG3mvwh1LEdK4H4FKxeoOJNz90H8l8dQ=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "594eb0dd6adfb4a344d6e8b7807fb9e697e0d890", + "rev": "3df392af2a61d61bdac1afd9c3674f27d6aa8efc", "type": "github" }, "original": { From 82d443e76f971f739ea53291eb078807152ec7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Tue, 2 Jan 2024 18:14:56 +0100 Subject: [PATCH 2/3] Adapt tests to https://github.com/IntersectMBO/cardano-api/pull/390 --- .../cardano-cli-golden/Test/Golden/Governance/Committee.hs | 4 ++-- .../golden/governance/drep/drep_registration_certificate.json | 2 +- .../files/golden/governance/drep/drep_retirement_cert | 2 +- .../golden/governance/stakeaddress/alwaysAbstainDeleg.cert | 2 +- .../golden/governance/stakeaddress/noConfidenceDeleg.cert | 2 +- .../governance/stakeaddress/poolAndAlwaysAbstainDeleg.cert | 2 +- .../golden/governance/stakeaddress/poolAndDrepVkeyDeleg.cert | 2 +- .../governance/stakeaddress/poolAndNoConfidenceDeleg.cert | 2 +- .../files/golden/shelley/stake-address/reg-certificate-2.json | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs index 49579fd55d..1ad6179269 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs @@ -121,7 +121,7 @@ hprop_golden_governanceCommitteeCreateHotKeyAuthorizationCertificate = , "--out-file", certFile ] - H.assertFileOccurences 1 "CertificateShelley" certFile + H.assertFileOccurences 1 "CertificateConway" certFile H.assertFileOccurences 1 "Constitutional Committee Hot Key Registration Certificate" certFile hprop_golden_governanceCommitteeCreateColdKeyResignationCertificate :: Property @@ -144,7 +144,7 @@ hprop_golden_governanceCommitteeCreateColdKeyResignationCertificate = , "--out-file", certFile ] - H.assertFileOccurences 1 "CertificateShelley" certFile + H.assertFileOccurences 1 "CertificateConway" certFile H.assertFileOccurences 1 "Constitutional Committee Cold Key Resignation Certificate" certFile hprop_golden_governanceUpdateCommittee :: Property diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_registration_certificate.json b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_registration_certificate.json index 9d06ef4021..f3c6fd0b4e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_registration_certificate.json +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_registration_certificate.json @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "DRep Key Registration Certificate", "cborHex": "84108200581ceb09d5556a8bce421074e394d02c79ced96741657b4cf7ca8995294d00826964756d6d792d75726c582052e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_retirement_cert b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_retirement_cert index 371c1d3052..9fb04088b6 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_retirement_cert +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_retirement_cert @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "DRep Retirement Certificate", "cborHex": "83118200581ceb09d5556a8bce421074e394d02c79ced96741657b4cf7ca8995294d1a000f4240" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/alwaysAbstainDeleg.cert b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/alwaysAbstainDeleg.cert index 818d8e536b..5a3e763092 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/alwaysAbstainDeleg.cert +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/alwaysAbstainDeleg.cert @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "Vote Delegation Certificate", "cborHex": "83098200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab018102" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/noConfidenceDeleg.cert b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/noConfidenceDeleg.cert index f0f7526649..ec66a28ef3 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/noConfidenceDeleg.cert +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/noConfidenceDeleg.cert @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "Vote Delegation Certificate", "cborHex": "83098200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab018103" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndAlwaysAbstainDeleg.cert b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndAlwaysAbstainDeleg.cert index 9aa3393b8a..26ebf5c581 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndAlwaysAbstainDeleg.cert +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndAlwaysAbstainDeleg.cert @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "Stake and Vote Delegation Certificate", "cborHex": "840a8200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab01581cc27cf021914a2b3bcb286d3d741979083422378c577fe757702b69888102" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndDrepVkeyDeleg.cert b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndDrepVkeyDeleg.cert index c5208eff1b..6662aef102 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndDrepVkeyDeleg.cert +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndDrepVkeyDeleg.cert @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "Stake and Vote Delegation Certificate", "cborHex": "840a8200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab01581cc27cf021914a2b3bcb286d3d741979083422378c577fe757702b69888200581ce68f9ee70599cb93d9f60678f9c6463c01938c27d9820c7bf93887a5" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndNoConfidenceDeleg.cert b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndNoConfidenceDeleg.cert index 688ad49c70..7ee0df9837 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndNoConfidenceDeleg.cert +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndNoConfidenceDeleg.cert @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "Stake and Vote Delegation Certificate", "cborHex": "840a8200581cef1785cf18928f8353c90e76b7a8fc60855472d31a0ea1c1c774ab01581cc27cf021914a2b3bcb286d3d741979083422378c577fe757702b69888103" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/stake-address/reg-certificate-2.json b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/stake-address/reg-certificate-2.json index 033bdb92d4..c3abfb43cc 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/stake-address/reg-certificate-2.json +++ b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/stake-address/reg-certificate-2.json @@ -1,5 +1,5 @@ { - "type": "CertificateShelley", + "type": "CertificateConway", "description": "Stake Address Registration Certificate", "cborHex": "83078200581c81b4245f84593f63c0ff2296930254f77a0690fa9de5f969cac27cb01a001e8480" } From 75509982084df93dfdbf55c2202e7d733d42253d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Wed, 3 Jan 2024 11:30:03 +0100 Subject: [PATCH 3/3] Invalidate cabal cache --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index de9d18eb4e..3f67aa0d02 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -20,7 +20,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2023-11-28" + CABAL_CACHE_VERSION: "2024-01-03" concurrency: group: >