diff --git a/cabal.project b/cabal.project index 2a5232cf9a8..11ca8cbd498 100644 --- a/cabal.project +++ b/cabal.project @@ -31,6 +31,20 @@ packages: trace-resources trace-forward +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api.git + tag: 1244e702287daedbde0cffa320d1eb423493321e + subdir: cardano-api + --sha256: 1wjhyliq3qv83m956mvinshd8cbrkyjlcx97s34qxi9cilskn210 + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-cli.git + tag: 0196f48ebc713072bfb6efb74ef204f638456d78 + subdir: cardano-cli + --sha256: 08z15kab32pw9r7ry6z8lakk854dq2ym81cbw8pifibbfihzqd1i + program-options ghc-options: -Werror diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs index 658d8c9d51a..d5a796f0fef 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs @@ -37,6 +37,7 @@ import Hedgehog (Property) import qualified Hedgehog as H import qualified Hedgehog.Extras.Test.Base as H import qualified Hedgehog.Extras.Test.File as H +import Cardano.Api.HasTypeProxy (Proxy(..)) hprop_transaction :: Property hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbsBasePath' -> runWithDefaultWatchdog_ $ do @@ -86,7 +87,8 @@ hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbs , "--out-file", txbodyFp ] cddlUnwitnessedTx <- H.readJsonFileOk txbodyFp - apiTx <- H.evalEither $ deserialiseTxLedgerCddl sbe cddlUnwitnessedTx + apiTx <- H.evalEither $ deserialiseFromTextEnvelope (proxyToAsType Proxy :: AsType (Tx BabbageEra)) + cddlUnwitnessedTx let txFee = L.unCoin $ extractTxFee apiTx -- This is the current calculated fee. diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json index 96ac06d38a0..bfde84253b3 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json @@ -1,5 +1,7 @@ { "collateralPercentage": 150, + "committeeMaxTermLength": 200, + "committeeMinSize": 0, "costModels": { "PlutusV1": [ 205665, @@ -582,12 +584,26 @@ 1 ] }, - "decentralization": null, + "dRepActivity": 100, + "dRepDeposit": 1000000, + "dRepVotingThresholds": { + "committeeNoConfidence": 0, + "committeeNormal": 0.5, + "hardForkInitiation": 0.5, + "motionNoConfidence": 0, + "ppEconomicGroup": 0.5, + "ppGovGroup": 0.5, + "ppNetworkGroup": 0.5, + "ppTechnicalGroup": 0.5, + "treasuryWithdrawal": 0.5, + "updateToConstitution": 0 + }, "executionUnitPrices": { "priceMemory": 5.77e-2, "priceSteps": 7.21e-5 }, - "extraPraosEntropy": null, + "govActionDeposit": 1000000, + "govActionLifetime": 1, "maxBlockBodySize": 65536, "maxBlockExecutionUnits": { "memory": 62000000, @@ -601,11 +617,18 @@ }, "maxTxSize": 16384, "maxValueSize": 5000, + "minFeeRefScriptCostPerByte": 0, "minPoolCost": 0, - "minUTxOValue": null, "monetaryExpansion": 0.1, "poolPledgeInfluence": 0, "poolRetireMaxEpoch": 18, + "poolVotingThresholds": { + "committeeNoConfidence": 0.5, + "committeeNormal": 0.5, + "hardForkInitiation": 0.5, + "motionNoConfidence": 0.5, + "ppSecurityGroup": 0.5 + }, "protocolVersion": { "major": 10, "minor": 0 diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt index 96ac06d38a0..bfde84253b3 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt @@ -1,5 +1,7 @@ { "collateralPercentage": 150, + "committeeMaxTermLength": 200, + "committeeMinSize": 0, "costModels": { "PlutusV1": [ 205665, @@ -582,12 +584,26 @@ 1 ] }, - "decentralization": null, + "dRepActivity": 100, + "dRepDeposit": 1000000, + "dRepVotingThresholds": { + "committeeNoConfidence": 0, + "committeeNormal": 0.5, + "hardForkInitiation": 0.5, + "motionNoConfidence": 0, + "ppEconomicGroup": 0.5, + "ppGovGroup": 0.5, + "ppNetworkGroup": 0.5, + "ppTechnicalGroup": 0.5, + "treasuryWithdrawal": 0.5, + "updateToConstitution": 0 + }, "executionUnitPrices": { "priceMemory": 5.77e-2, "priceSteps": 7.21e-5 }, - "extraPraosEntropy": null, + "govActionDeposit": 1000000, + "govActionLifetime": 1, "maxBlockBodySize": 65536, "maxBlockExecutionUnits": { "memory": 62000000, @@ -601,11 +617,18 @@ }, "maxTxSize": 16384, "maxValueSize": 5000, + "minFeeRefScriptCostPerByte": 0, "minPoolCost": 0, - "minUTxOValue": null, "monetaryExpansion": 0.1, "poolPledgeInfluence": 0, "poolRetireMaxEpoch": 18, + "poolVotingThresholds": { + "committeeNoConfidence": 0.5, + "committeeNormal": 0.5, + "hardForkInitiation": 0.5, + "motionNoConfidence": 0.5, + "ppSecurityGroup": 0.5 + }, "protocolVersion": { "major": 10, "minor": 0