Use api and cli SRPs for serialization fix

Update cost model
IntersectMBO · Jun 20, 2024 · ff48d91 · ff48d91
1 parent 431ebf8
commit ff48d91
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": "",