From ff48d91cd8a283e3f177dee5768977b82aa7978c Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Thu, 20 Jun 2024 14:28:16 +0200 Subject: [PATCH] Use api and cli SRPs for serialization fix Update cost model --- bench/tx-generator/tx-generator.cabal | 2 +- cabal.project | 14 ++++++++++++-- cardano-node-chairman/cardano-node-chairman.cabal | 2 +- cardano-submit-api/cardano-submit-api.cabal | 2 +- cardano-testnet/cardano-testnet.cabal | 2 +- scripts/babbage/alonzo-babbage-test-genesis.json | 12 +++++++++++- scripts/babbage/conway-babbage-test-genesis.json | 2 +- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index c87213fc7ee..c5ede145b0b 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -104,7 +104,7 @@ library , bytestring , cardano-api ^>= 8.48 , cardano-binary - , cardano-cli ^>= 8.23 + , cardano-cli ^>= 8.24 , cardano-crypto-class , cardano-crypto-wrapper , cardano-data diff --git a/cabal.project b/cabal.project index 04d60564aec..87e87aaf8a3 100644 --- a/cabal.project +++ b/cabal.project @@ -70,6 +70,16 @@ allow-newer: katip:Win32 source-repository-package type: git location: https://github.com/IntersectMBO/cardano-cli - tag: 0d750dd2a63f267f2eb94ef3c42cefa6e6fac06e - --sha256: sha256-nnrxHDUgLTN6czdlqSRhddB3r09hmJHHNceG2JmM0OA= + tag: 8b256f0db70bb8ba00d9d7539d45a1a0f3ff5622 + --sha256: sha256-kpHcVdo3CVeX1kiyLYBl0mifEC9xCAuCZ2DtqiZ4Vns= subdir: cardano-cli + + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api + tag: 17c02c4161df2707f3ba98fbc7b33968cee6678d + --sha256: sha256-C5DK/YNJrjh1GkB1gff07xLjxCzCeafv6TCKnXoot5w= + subdir: cardano-api + + diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index 89b9f4c488c..fc1e36cbf93 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -88,5 +88,5 @@ test-suite chairman-tests ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T" build-tool-depends: cardano-node:cardano-node - , cardano-cli:cardano-cli ^>= 8.23.0.0 + , cardano-cli:cardano-cli ^>= 8.24.0.0 , cardano-node-chairman:cardano-node-chairman diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index 104fe9f2d47..0e682166678 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -41,7 +41,7 @@ library , bytestring , cardano-api ^>= 8.48 , cardano-binary - , cardano-cli ^>= 8.23 + , cardano-cli ^>= 8.24 , cardano-crypto-class ^>= 2.1.2 , http-media , iohk-monitoring diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index 18598426230..173263f6112 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -36,7 +36,7 @@ library , ansi-terminal , bytestring , cardano-api ^>= 8.48 - , cardano-cli ^>= 8.23 + , cardano-cli ^>= 8.24 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>= 0.2.2 diff --git a/scripts/babbage/alonzo-babbage-test-genesis.json b/scripts/babbage/alonzo-babbage-test-genesis.json index 5ef1a3901a9..56f623e1561 100644 --- a/scripts/babbage/alonzo-babbage-test-genesis.json +++ b/scripts/babbage/alonzo-babbage-test-genesis.json @@ -365,7 +365,17 @@ "verifyEd25519Signature-memory-arguments": 10, "verifySchnorrSecp256k1Signature-cpu-arguments-intercept": 38887044, "verifySchnorrSecp256k1Signature-cpu-arguments-slope": 32947, - "verifySchnorrSecp256k1Signature-memory-arguments": 10 + "verifySchnorrSecp256k1Signature-memory-arguments": 10, + "byteStringToInteger-cpu-arguments-c0": 0, + "byteStringToInteger-cpu-arguments-c1": 0, + "byteStringToInteger-cpu-arguments-c2": 0, + "byteStringToInteger-memory-arguments-intercept": 0, + "byteStringToInteger-memory-arguments-slope": 0, + "integerToByteString-cpu-arguments-c0": 0, + "integerToByteString-cpu-arguments-c1": 0, + "integerToByteString-cpu-arguments-c2": 0, + "integerToByteString-memory-arguments-intercept": 0, + "integerToByteString-memory-arguments-slope": 0 } } } diff --git a/scripts/babbage/conway-babbage-test-genesis.json b/scripts/babbage/conway-babbage-test-genesis.json index f27ec351592..71990b818f8 100644 --- a/scripts/babbage/conway-babbage-test-genesis.json +++ b/scripts/babbage/conway-babbage-test-genesis.json @@ -25,7 +25,7 @@ "dRepDeposit": 2000000, "dRepActivity": 20, "minFeeRefScriptCostPerByte": 0, - "plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], + "plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], "constitution": { "anchor": { "url": "",