diff --git a/cabal.project b/cabal.project index 2605b44dd2..189509e395 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 2024-10-11T15:49:11Z - , cardano-haskell-packages 2024-10-11T15:49:11Z + , cardano-haskell-packages 2024-10-16T12:44:42Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index ceb770c201..5436548d38 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -196,7 +196,7 @@ library binary, bytestring, canonical-json, - cardano-api ^>=9.4, + cardano-api ^>=10.0, cardano-binary, cardano-crypto, cardano-crypto-class ^>=2.1.2, @@ -206,7 +206,7 @@ library cardano-ledger-api, cardano-ledger-core, cardano-ledger-shelley, - cardano-ping ^>=0.4, + cardano-ping ^>=0.5, cardano-prelude, cardano-slotting ^>=0.2.0.0, cardano-strict-containers ^>=0.1, @@ -229,10 +229,10 @@ library network, network-uri, optparse-applicative-fork, - ouroboros-consensus ^>=0.20, - ouroboros-consensus-cardano ^>=0.19, - ouroboros-consensus-protocol ^>=0.9.0.1, - ouroboros-network-api ^>=0.9, + ouroboros-consensus ^>=0.21, + ouroboros-consensus-cardano ^>=0.20, + ouroboros-consensus-protocol ^>=0.9.0.2, + ouroboros-network-api ^>=0.10, ouroboros-network-protocols, parsec, prettyprinter, diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs index 64585d88dc..514ceb0059 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs @@ -61,6 +61,7 @@ import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map import Data.Maybe (fromMaybe) import qualified Data.Sequence.Strict as Seq +import qualified Data.Set as Set import Data.String (fromString) import qualified Data.Text as Text import Data.Tuple (swap) @@ -370,6 +371,7 @@ runGenesisCreateTestNetDataCmd { L.drepExpiry = EpochNo 1_000 , L.drepAnchor = SNothing , L.drepDeposit = max (L.Coin 1_000_000) minDeposit + , L.drepDelegs = Set.empty } ) ) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action index 001b78ae01..99d344af9c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action @@ -1,5 +1,5 @@ { "type": "Governance proposal", "description": "Update protocol parameters proposal", - "cborHex": "84193039581de18f4a3466a404c11eb410313015b88e447d81b60089e25f611600e6058400f6a3031904d212a3009f1a000302590001011a00060bc719026d00011a000249f01903e800011a000249f018201a0025cea81971f70419744d186419744d186419744d186419744d186419744d186419744d18641864186419744d18641a000249f018201a000249f018201a000249f018201a000249f01903e800011a000249f018201a000249f01903e800081a000242201a00067e2318760001011a000249f01903e800081a000249f01a0001b79818f7011a000249f0192710011a0002155e19052e011903e81a000249f01903e8011a000249f018201a000249f018201a000249f0182001011a000249f0011a000249f0041a000194af18f8011a000194af18f8011a0002377c190556011a0002bdea1901f1011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000242201a00067e23187600010119f04c192bd200011a000249f018201a000242201a00067e2318760001011a000242201a00067e2318760001011a0025cea81971f707001a000141bb041a000249f019138800011a000249f018201a000302590001011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a00330da70101ff019f1a0003236119032c01011903e819023b00011903e8195e7104011903e818201a0001ca761928eb041959d818641959d818641959d818641959d818641959d818641959d81864186418641959d81864194c5118201a0002acfa182019b551041a000363151901ff00011a00015c3518201a000797751936f404021a0002ff941a0006ea7818dc0001011903e8196ff604021a0003bd081a00034ec5183e011a00102e0f19312a011a00032e801901a5011a0002da781903e819cf06011a00013a34182019a8f118201903e818201a00013aac0119e143041903e80a1a00030219189c011a00030219189c011a0003207c1901d9011a000330001901ff0119ccf3182019fd40182019ffd5182019581e18201940b318201a00012adf18201a0002ff941a0006ea7818dc0001011a00010f92192da7000119eabb18201a0002ff941a0006ea7818dc0001011a0002ff941a0006ea7818dc0001011a0011b22c1a0005fdde00021a000c504e197712041a001d6af61a0001425b041a00040c660004001a00014fab18201a0003236119032c010119a0de18201a00033d7618201979f41820197fb8182019a95d1820197df718201995aa18201a0223accc0a1a009063b91903fd0a1a02515e841980b30a01010101010101010101ff029f0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101ff181e1a075bc371f6827835697066733a2f2f516d624c354542464a4c66384464506b5741736b47334575696e39744859386e617151324a446f486e574848584a5820de38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c" + "cborHex": "84193039581de18f4a3466a404c11eb410313015b88e447d81b60089e25f611600e6058400f6a3031904d212a3009f1a000302590001011a00060bc719026d00011a000249f01903e800011a000249f018201a0025cea81971f70419744d186419744d186419744d186419744d186419744d186419744d18641864186419744d18641a000249f018201a000249f018201a000249f018201a000249f01903e800011a000249f018201a000249f01903e800081a000242201a00067e2318760001011a000249f01903e800081a000249f01a0001b79818f7011a000249f0192710011a0002155e19052e011903e81a000249f01903e8011a000249f018201a000249f018201a000249f0182001011a000249f0011a000249f0041a000194af18f8011a000194af18f8011a0002377c190556011a0002bdea1901f1011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000242201a00067e23187600010119f04c192bd200011a000249f018201a000242201a00067e2318760001011a000242201a00067e2318760001011a0025cea81971f707001a000141bb041a000249f019138800011a000249f018201a000302590001011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a00330da70101ff019f1a0003236119032c01011903e819023b00011903e8195e7104011903e818201a0001ca761928eb041959d818641959d818641959d818641959d818641959d818641959d81864186418641959d81864194c5118201a0002acfa182019b551041a000363151901ff00011a00015c3518201a000797751936f404021a0002ff941a0006ea7818dc0001011903e8196ff604021a0003bd081a00034ec5183e011a00102e0f19312a011a00032e801901a5011a0002da781903e819cf06011a00013a34182019a8f118201903e818201a00013aac0119e143041903e80a1a00030219189c011a00030219189c011a0003207c1901d9011a000330001901ff0119ccf3182019fd40182019ffd5182019581e18201940b318201a00012adf18201a0002ff941a0006ea7818dc0001011a00010f92192da7000119eabb18201a0002ff941a0006ea7818dc0001011a0002ff941a0006ea7818dc0001011a0011b22c1a0005fdde00021a000c504e197712041a001d6af61a0001425b041a00040c660004001a00014fab18201a0003236119032c010119a0de18201a00033d7618201979f41820197fb8182019a95d1820197df718201995aa18201a0223accc0a1a009063b91903fd0a1a02515e841980b30a01010101010101010101ff029f010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101ff181e1a075bc371f6827835697066733a2f2f516d624c354542464a4c66384464506b5741736b47334575696e39744859386e617151324a446f486e574848584a5820de38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c" } diff --git a/cardano-cli/test/cardano-cli-golden/files/input/governance/costmodels.json b/cardano-cli/test/cardano-cli-golden/files/input/governance/costmodels.json index 3882f15e99..0d4b0320cf 100644 --- a/cardano-cli/test/cardano-cli-golden/files/input/governance/costmodels.json +++ b/cardano-cli/test/cardano-cli-golden/files/input/governance/costmodels.json @@ -462,11 +462,11 @@ "divideInteger-memory-arguments-minimum": 1, "divideInteger-memory-arguments-slope": 1, "divideInteger-cpu-arguments-model-arguments-minimum": 1, - "divideInteger-cpu-arguments-model-arguments-c20": 1, - "divideInteger-cpu-arguments-model-arguments-c11": 1, - "divideInteger-cpu-arguments-model-arguments-c10": 1, - "divideInteger-cpu-arguments-model-arguments-c02": 1, - "divideInteger-cpu-arguments-model-arguments-c01": 1, + "divideInteger-cpu-arguments-model-arguments-c20": 1, + "divideInteger-cpu-arguments-model-arguments-c11": 1, + "divideInteger-cpu-arguments-model-arguments-c10": 1, + "divideInteger-cpu-arguments-model-arguments-c02": 1, + "divideInteger-cpu-arguments-model-arguments-c01": 1, "divideInteger-cpu-arguments-model-arguments-c00": 1, "encodeUtf8-cpu-arguments-intercept": 1, "encodeUtf8-cpu-arguments-slope": 1, @@ -537,11 +537,11 @@ "modInteger-memory-arguments-minimum": 1, "modInteger-memory-arguments-slope": 1, "modInteger-cpu-arguments-model-arguments-minimum": 1, - "modInteger-cpu-arguments-model-arguments-c20": 1, - "modInteger-cpu-arguments-model-arguments-c11": 1, - "modInteger-cpu-arguments-model-arguments-c10": 1, - "modInteger-cpu-arguments-model-arguments-c02": 1, - "modInteger-cpu-arguments-model-arguments-c01": 1, + "modInteger-cpu-arguments-model-arguments-c20": 1, + "modInteger-cpu-arguments-model-arguments-c11": 1, + "modInteger-cpu-arguments-model-arguments-c10": 1, + "modInteger-cpu-arguments-model-arguments-c02": 1, + "modInteger-cpu-arguments-model-arguments-c01": 1, "modInteger-cpu-arguments-model-arguments-c00": 1, "multiplyInteger-cpu-arguments-intercept": 1, "multiplyInteger-cpu-arguments-slope": 1, @@ -616,6 +616,52 @@ "verifyEd25519Signature-memory-arguments": 1, "verifySchnorrSecp256k1Signature-cpu-arguments-intercept": 1, "verifySchnorrSecp256k1Signature-cpu-arguments-slope": 1, - "verifySchnorrSecp256k1Signature-memory-arguments": 1 + "verifySchnorrSecp256k1Signature-memory-arguments": 1, + "andByteString-cpu-arguments-intercept": 1, + "andByteString-cpu-arguments-slope1": 1, + "andByteString-cpu-arguments-slope2": 1, + "andByteString-memory-arguments-intercept": 1, + "andByteString-memory-arguments-slope": 1, + "orByteString-cpu-arguments-intercept": 1, + "orByteString-cpu-arguments-slope1": 1, + "orByteString-cpu-arguments-slope2": 1, + "orByteString-memory-arguments-intercept": 1, + "orByteString-memory-arguments-slope": 1, + "xorByteString-cpu-arguments-intercept": 1, + "xorByteString-cpu-arguments-slope1": 1, + "xorByteString-cpu-arguments-slope2": 1, + "xorByteString-memory-arguments-intercept": 1, + "xorByteString-memory-arguments-slope": 1, + "complementByteString-cpu-arguments-intercept": 1, + "complementByteString-cpu-arguments-slope": 1, + "complementByteString-memory-arguments-intercept": 1, + "complementByteString-memory-arguments-slope": 1, + "readBit-cpu-arguments": 1, + "readBit-memory-arguments": 1, + "writeBits-cpu-arguments-intercept": 1, + "writeBits-cpu-arguments-slope": 1, + "writeBits-memory-arguments-intercept": 1, + "writeBits-memory-arguments-slope": 1, + "replicateByte-cpu-arguments-intercept": 1, + "replicateByte-cpu-arguments-slope": 1, + "replicateByte-memory-arguments-intercept": 1, + "replicateByte-memory-arguments-slope": 1, + "shiftByteString-cpu-arguments-intercept": 1, + "shiftByteString-cpu-arguments-slope": 1, + "shiftByteString-memory-arguments-intercept": 1, + "shiftByteString-memory-arguments-slope": 1, + "rotateByteString-cpu-arguments-intercept": 1, + "rotateByteString-cpu-arguments-slope": 1, + "rotateByteString-memory-arguments-intercept": 1, + "rotateByteString-memory-arguments-slope": 1, + "countSetBits-cpu-arguments-intercept": 1, + "countSetBits-cpu-arguments-slope": 1, + "countSetBits-memory-arguments": 1, + "findFirstSetBit-cpu-arguments-intercept": 1, + "findFirstSetBit-cpu-arguments-slope": 1, + "findFirstSetBit-memory-arguments": 1, + "ripemd_160-cpu-arguments-intercept": 1, + "ripemd_160-cpu-arguments-slope": 1, + "ripemd_160-memory-arguments": 1 } } diff --git a/flake.lock b/flake.lock index f0b611b237..f4f536210c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1728663083, - "narHash": "sha256-ejmJzPYPKdIwN53Arz3ycNcMO1YnS4k4uSBC7XeBRsQ=", + "lastModified": 1729088390, + "narHash": "sha256-U3zbe5q7SvMHfUvcYfa/e4KXDHFWv6ru7Drwd1PGOx4=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "16d7391e69a69b9954acf097ffca3bda61a4faf0", + "rev": "38257ddc6cc3e30a29c93c97cfbc0e1af2bb2db5", "type": "github" }, "original": {