Merge branch 'dshuiski/collateral' into dshuiski/balancer-constraints

CHANGELOG.md

@@ -7,77 +7,103 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
+- [[v9.3.1]](#v931)
+  - [Fixed](#fixed)
+- [[v9.3.0]](#v930)
+  - [Fixed](#fixed-1)
+  - [Changed](#changed)
 - [[v9.2.0]](#v920)
   - [Added](#added)
-  - [Changed](#changed)
+  - [Changed](#changed-1)
   - [Removed](#removed)
-  - [Fixed](#fixed)
+  - [Fixed](#fixed-2)
 - [[v9.1.0]](#v910)
   - [Added](#added-1)
-  - [Changed](#changed-1)
+  - [Changed](#changed-2)
   - [Removed](#removed-1)
-  - [Fixed](#fixed-1)
+  - [Fixed](#fixed-3)
 - [[v9.0.0]](#v900)
   - [Deprecated](#deprecated)
   - [Added](#added-2)
   - [Removed](#removed-2)
-  - [Changed](#changed-2)
-  - [Fixed](#fixed-2)
+  - [Changed](#changed-3)
+  - [Fixed](#fixed-4)
 - [[v8.0.0]](#v800)
   - [Added](#added-3)
-  - [Changed](#changed-3)
-  - [Fixed](#fixed-3)
+  - [Changed](#changed-4)
+  - [Fixed](#fixed-5)
   - [Removed](#removed-3)
 - [[v7.0.0]](#v700)
   - [Added](#added-4)
-  - [Changed](#changed-4)
-  - [Fixed](#fixed-4)
+  - [Changed](#changed-5)
+  - [Fixed](#fixed-6)
   - [Removed](#removed-4)
 - [[v6.0.0]](#v600)
   - [Added](#added-5)
-  - [Changed](#changed-5)
-  - [Fixed](#fixed-5)
+  - [Changed](#changed-6)
+  - [Fixed](#fixed-7)
   - [Removed](#removed-5)
 - [[v5.0.0]](#v500)
   - [Added](#added-6)
-  - [Changed](#changed-6)
+  - [Changed](#changed-7)
   - [Removed](#removed-6)
-  - [Fixed](#fixed-6)
+  - [Fixed](#fixed-8)
   - [Runtime Dependencies](#runtime-dependencies)
 - [[v4.0.2] - 2023-01-17](#v402---2023-01-17)
-  - [Fixed](#fixed-7)
+  - [Fixed](#fixed-9)
 - [[v4.0.1] - 2022-12-20](#v401---2022-12-20)
   - [Added](#added-7)
 - [[v4.0.0] - 2022-12-15](#v400---2022-12-15)
   - [Added](#added-8)
-  - [Changed](#changed-7)
+  - [Changed](#changed-8)
   - [Removed](#removed-7)
-  - [Fixed](#fixed-8)
+  - [Fixed](#fixed-10)
   - [Runtime Dependencies](#runtime-dependencies-1)
 - [[3.0.0] - 2022-11-21](#300---2022-11-21)
   - [Added](#added-9)
-  - [Changed](#changed-8)
+  - [Changed](#changed-9)
   - [Removed](#removed-8)
-  - [Fixed](#fixed-9)
+  - [Fixed](#fixed-11)
   - [Runtime Dependencies](#runtime-dependencies-2)
 - [[2.0.0] - 2022-09-12](#200---2022-09-12)
   - [Added](#added-10)
-  - [Changed](#changed-9)
+  - [Changed](#changed-10)
   - [Removed](#removed-9)
-  - [Fixed](#fixed-10)
+  - [Fixed](#fixed-12)
 - [[2.0.0-alpha] - 2022-07-05](#200-alpha---2022-07-05)
   - [Added](#added-11)
   - [Removed](#removed-10)
-  - [Changed](#changed-10)
-  - [Fixed](#fixed-11)
+  - [Changed](#changed-11)
+  - [Fixed](#fixed-13)
 - [[1.1.0] - 2022-06-30](#110---2022-06-30)
-  - [Fixed](#fixed-12)
+  - [Fixed](#fixed-14)
 - [[1.0.1] - 2022-06-17](#101---2022-06-17)
-  - [Fixed](#fixed-13)
+  - [Fixed](#fixed-15)
 - [[1.0.0] - 2022-06-10](#100---2022-06-10)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## [v9.3.1]
+
+### Fixed
+
+- cardano-testnet Lovelace supply has been raised to uint64 max value ([#1644](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1644))
+
+- cardano-testnet cleanup logic: nodes spawned by cardano-testnet should now be correctly cleaned up after test execution or upon receiving `SIGINT` or `SIGTERM` signals ([#1644](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1644))
+
+- Nix shell for darwin platforms (`x86_64-darwin` and `aarch64-darwin`). **Note that the CTL runtime is not provided for darwin due to the lack of support in `cardano.nix`** ([#1644](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1644))
+
+## [v9.3.0]
+
+### Fixed
+
+- Updated fee structure that takes [reference script size fee requirements into account](https://github.com/IntersectMBO/cardano-ledger/blob/cardano-ledger-shelley-ma-test-1.2.2.3/docs/adr/2024-08-14_009-refscripts-fee-change.md) ([#1647](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1647))
+- Fixed Blockfrost PlutusV3 cost model decoding (preprod and preview return cost models in different formats) ([#1647](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1647))
+
+### Changed
+
+- `cardano-serialization-lib` has been updated to `v12.0.0` ([#1647](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1647))
+
 ## [v9.2.0]
 
 ### Added

examples/MintsMultipleTokens.purs

@@ -64,6 +64,10 @@ contract = do
           ( PlutusScriptCredential (ScriptValue mp1) $ RedeemerDatum $ Integer
               (BigInt.fromInt 1)
           )
+      , MintAsset cs1 tn2 Int.one
+          ( PlutusScriptCredential (ScriptValue mp1) $ RedeemerDatum $ Integer
+              (BigInt.fromInt 1)
+          )
       , MintAsset cs2 tn2 Int.one
           ( PlutusScriptCredential (ScriptValue mp2) $ RedeemerDatum $ Integer
               (BigInt.fromInt 2)

flake.nix

@@ -168,7 +168,7 @@
               shellHook = exportOgmiosFixtures;
               packageLockOnly = true;
               packages = with pkgs;
-                (if (builtins.elem system linuxSystems) then [ psmisc ] else [ ]) ++
+                (if (builtins.elem system linuxSystems) then [ psmisc procps ] else [ ]) ++
                 [
                   arion
                   fd

nix/default.nix

@@ -356,6 +356,7 @@ let
           cardano-node
           cardano-cli
           psmisc
+          procps
         ]
         ++ (args.buildInputs or [ ]);
       }

package.json

@@ -32,7 +32,7 @@
   "license": "MIT",
   "dependencies": {
     "@mlabs-haskell/cardano-message-signing": "^1.0.1",
-    "@mlabs-haskell/cardano-serialization-lib-gc": "12.0.0-alpha.31",
+    "@mlabs-haskell/cardano-serialization-lib-gc": "12.0.0",
     "@mlabs-haskell/json-bigint": "2.0.0",
     "@mlabs-haskell/uplc-apply-args": "1.0.29-alpha",
     "@noble/secp256k1": "^1.7.0",

packages.dhall

@@ -118,7 +118,7 @@ let additions =
           , "untagged-union"
           ]
         , repo = "https://github.com/mlabs-haskell/purescript-cip30"
-        , version = "v1.0.0"
+        , version = "v1.0.1"
         }
       , cip30-typesafe =
         { dependencies =
@@ -214,7 +214,7 @@ let additions =
           ]
         , repo =
             "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib"
-        , version = "v1.0.0"
+        , version = "v2.0.0"
         }
       , cardano-plutus-data-schema =
         { dependencies = [ "prelude" ]
@@ -372,7 +372,7 @@ let additions =
           , "unsafe-coerce"
           ]
         , repo = "https://github.com/mlabs-haskell/purescript-cardano-types"
-        , version = "v2.0.1"
+        , version = "v3.0.0"
         }
       , cardano-message-signing =
         { dependencies =
@@ -453,7 +453,7 @@ let additions =
           ]
         , repo =
             "https://github.com/mlabs-haskell/purescript-cardano-transaction-builder"
-        , version = "a9c033b9a2bb78b134ae5309209f73e47f3d5791"
+        , version = "v2.0.0"
         }
       , mote-testplan =
         { dependencies =

spago.dhall

@@ -1,7 +1,3 @@
-{-
-Welcome to a Spago project!
-You can edit this file as you like.
--}
 { name = "cardano-transaction-lib"
 , dependencies =
   [ "aeson"