From 4f40bba1846b9bb3455c41946538ba385215e940 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuiski Date: Mon, 18 Nov 2024 15:35:34 +0100 Subject: [PATCH 1/4] Update to CSL v13.2.0 This should resolve the issue of occasional transaction script integrity hash mismatches on tx submission. --- package-lock.json | 50 +++++++++++++++++++++++----------------------- package.json | 2 +- packages.dhall | 4 ++-- spago-packages.nix | 12 +++++------ 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1bc9b5a50..d89cef17e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "license": "MIT", "dependencies": { "@mlabs-haskell/cardano-message-signing": "^1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc": "12.0.0", + "@mlabs-haskell/cardano-serialization-lib-gc": "13.2.0", "@mlabs-haskell/json-bigint": "2.0.0", "@mlabs-haskell/uplc-apply-args": "1.0.29-alpha", "@noble/secp256k1": "^1.7.0", @@ -62,14 +62,14 @@ "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, "node_modules/@emurgo/cardano-serialization-lib-browser": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-12.0.0.tgz", - "integrity": "sha512-sAVjtaSwujQ3WaJY7OnsOt9mGbMF6YVFg/D4SWLr666zo3ESmislH0FLD932yFTOSJtOQV1oF+Pk8Ee2lR7X5A==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-13.2.0.tgz", + "integrity": "sha512-IOUETh9txYfXoTLaX3Ut71UcLtWpFL0ewBNDltgnGKE6k9qM0CurFR8tSoAE1i0IvTi/v/oIZX2oqXex/Si65Q==" }, "node_modules/@emurgo/cardano-serialization-lib-nodejs": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0.tgz", - "integrity": "sha512-r7ZFYMr1N/i2GbhPAmz7JjKhfjEu7q8sa5beX2rLoV+xTkKGfknCTOsVvT0LqgKOUXAzcSQhNNHUKFd27+sLiw==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-13.2.0.tgz", + "integrity": "sha512-Bz1zLGEqBQ0BVkqt1OgMxdBOE3BdUWUd7Ly9Ecr/aUwkA8AV1w1XzBMe4xblmJHnB1XXNlPH4SraXCvO+q0Mig==" }, "node_modules/@esbuild/android-arm": { "version": "0.18.11", @@ -512,13 +512,13 @@ } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-12.0.0.tgz", - "integrity": "sha512-8qwkJzDV1CEjbpZZ3sX5gkP6Tug0mzBSeO9ppHBT6wFEqyi5HXA5oxmN0TGoFecvWVG5f6JmRVeBS0sDqsi20A==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-13.2.0.tgz", + "integrity": "sha512-FOuGiv7k/G8g/+IRmDFLcpmpBb1rKoy5RhNGxcD+csL6una69LIuRwEyp9rDDcNxw9MSe88DLX0EHjq6PQ/bHA==", "dependencies": { - "@emurgo/cardano-serialization-lib-browser": "12.0.0", - "@emurgo/cardano-serialization-lib-nodejs": "12.0.0", - "@mlabs-haskell/csl-gc-wrapper": "^1.0.2" + "@emurgo/cardano-serialization-lib-browser": "13.2.0", + "@emurgo/cardano-serialization-lib-nodejs": "13.2.0", + "@mlabs-haskell/csl-gc-wrapper": "1.0.2" } }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { @@ -6414,14 +6414,14 @@ "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, "@emurgo/cardano-serialization-lib-browser": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-12.0.0.tgz", - "integrity": "sha512-sAVjtaSwujQ3WaJY7OnsOt9mGbMF6YVFg/D4SWLr666zo3ESmislH0FLD932yFTOSJtOQV1oF+Pk8Ee2lR7X5A==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-13.2.0.tgz", + "integrity": "sha512-IOUETh9txYfXoTLaX3Ut71UcLtWpFL0ewBNDltgnGKE6k9qM0CurFR8tSoAE1i0IvTi/v/oIZX2oqXex/Si65Q==" }, "@emurgo/cardano-serialization-lib-nodejs": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0.tgz", - "integrity": "sha512-r7ZFYMr1N/i2GbhPAmz7JjKhfjEu7q8sa5beX2rLoV+xTkKGfknCTOsVvT0LqgKOUXAzcSQhNNHUKFd27+sLiw==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-13.2.0.tgz", + "integrity": "sha512-Bz1zLGEqBQ0BVkqt1OgMxdBOE3BdUWUd7Ly9Ecr/aUwkA8AV1w1XzBMe4xblmJHnB1XXNlPH4SraXCvO+q0Mig==" }, "@esbuild/android-arm": { "version": "0.18.11", @@ -6654,13 +6654,13 @@ } }, "@mlabs-haskell/cardano-serialization-lib-gc": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-12.0.0.tgz", - "integrity": "sha512-8qwkJzDV1CEjbpZZ3sX5gkP6Tug0mzBSeO9ppHBT6wFEqyi5HXA5oxmN0TGoFecvWVG5f6JmRVeBS0sDqsi20A==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-13.2.0.tgz", + "integrity": "sha512-FOuGiv7k/G8g/+IRmDFLcpmpBb1rKoy5RhNGxcD+csL6una69LIuRwEyp9rDDcNxw9MSe88DLX0EHjq6PQ/bHA==", "requires": { - "@emurgo/cardano-serialization-lib-browser": "12.0.0", - "@emurgo/cardano-serialization-lib-nodejs": "12.0.0", - "@mlabs-haskell/csl-gc-wrapper": "^1.0.2" + "@emurgo/cardano-serialization-lib-browser": "13.2.0", + "@emurgo/cardano-serialization-lib-nodejs": "13.2.0", + "@mlabs-haskell/csl-gc-wrapper": "1.0.2" } }, "@mlabs-haskell/csl-gc-wrapper": { diff --git a/package.json b/package.json index 8753e118e..cd2445a7d 100755 --- a/package.json +++ b/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", + "@mlabs-haskell/cardano-serialization-lib-gc": "13.2.0", "@mlabs-haskell/json-bigint": "2.0.0", "@mlabs-haskell/uplc-apply-args": "1.0.29-alpha", "@noble/secp256k1": "^1.7.0", diff --git a/packages.dhall b/packages.dhall index 11742a599..5dd5b16c9 100644 --- a/packages.dhall +++ b/packages.dhall @@ -214,7 +214,7 @@ let additions = ] , repo = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib" - , version = "v2.0.0" + , version = "edc5f2bdbe33fd09dab3fbe7a43859de9e825ff1" } , cardano-plutus-data-schema = { dependencies = [ "prelude" ] @@ -372,7 +372,7 @@ let additions = , "unsafe-coerce" ] , repo = "https://github.com/mlabs-haskell/purescript-cardano-types" - , version = "v3.0.0" + , version = "1036aa73a07f1aaa367c9d2cb53c701b09eecb26" } , cardano-message-signing = { dependencies = diff --git a/spago-packages.nix b/spago-packages.nix index 6ac9df12a..4759929c9 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -271,11 +271,11 @@ let "cardano-serialization-lib" = pkgs.stdenv.mkDerivation { name = "cardano-serialization-lib"; - version = "v2.0.0"; + version = "edc5f2bdbe33fd09dab3fbe7a43859de9e825ff1"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib"; - rev = "d6ca2f9463b3d4e1cfa98e9964edbe7bfed02905"; - sha256 = "05f26v1xr7lkiw57rcqhjng299p7ly90wxqq9jay743pwvrysq0b"; + rev = "edc5f2bdbe33fd09dab3fbe7a43859de9e825ff1"; + sha256 = "13yl7l6rhk502bvmh82iba0a4y7mvm8v4d64x22v53ixpxxjfrf6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -295,11 +295,11 @@ let "cardano-types" = pkgs.stdenv.mkDerivation { name = "cardano-types"; - version = "v3.0.0"; + version = "1036aa73a07f1aaa367c9d2cb53c701b09eecb26"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-types"; - rev = "71b204c7c9c83b8280ed3ed14837d76b8ac0a6fe"; - sha256 = "1kffscail4kp5pygdv8nd2bclwd6c0cygkn5mn5sllnn29a63mpf"; + rev = "1036aa73a07f1aaa367c9d2cb53c701b09eecb26"; + sha256 = "1f3qjigpw84d8c8b2f3iz98far3kck7zb5apkl47zxmv1m6iwspx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From f70a82f551d1aa4065312695784536d9fecbc947 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuiski Date: Mon, 18 Nov 2024 17:49:39 +0100 Subject: [PATCH 2/4] Switch to versioned revisions of ps-csl and ps-cardano-types --- packages.dhall | 4 ++-- spago-packages.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages.dhall b/packages.dhall index 5dd5b16c9..1710d55d0 100644 --- a/packages.dhall +++ b/packages.dhall @@ -214,7 +214,7 @@ let additions = ] , repo = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib" - , version = "edc5f2bdbe33fd09dab3fbe7a43859de9e825ff1" + , version = "v3.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 = "1036aa73a07f1aaa367c9d2cb53c701b09eecb26" + , version = "v4.0.0" } , cardano-message-signing = { dependencies = diff --git a/spago-packages.nix b/spago-packages.nix index 4759929c9..8518c6e02 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -271,11 +271,11 @@ let "cardano-serialization-lib" = pkgs.stdenv.mkDerivation { name = "cardano-serialization-lib"; - version = "edc5f2bdbe33fd09dab3fbe7a43859de9e825ff1"; + version = "v3.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib"; - rev = "edc5f2bdbe33fd09dab3fbe7a43859de9e825ff1"; - sha256 = "13yl7l6rhk502bvmh82iba0a4y7mvm8v4d64x22v53ixpxxjfrf6"; + rev = "5865fddad045566ca2192526a7de355c59629000"; + sha256 = "18824bw5hczhm8wgg7n668fnx2bx0211ykj4dwnw2d7zxw1jm2z4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -295,11 +295,11 @@ let "cardano-types" = pkgs.stdenv.mkDerivation { name = "cardano-types"; - version = "1036aa73a07f1aaa367c9d2cb53c701b09eecb26"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-types"; - rev = "1036aa73a07f1aaa367c9d2cb53c701b09eecb26"; - sha256 = "1f3qjigpw84d8c8b2f3iz98far3kck7zb5apkl47zxmv1m6iwspx"; + rev = "46cc078af59926c566a38307cd34c40049e7880c"; + sha256 = "1m7asca6qsc8sd2lzp6ahiyxms1cvs5nqzwl5s2wwd3h4fv7w7cy"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From fa604fca85fd8068a28b92f4e307ab51b9a30f52 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuiski Date: Mon, 18 Nov 2024 17:59:22 +0100 Subject: [PATCH 3/4] Update ctl-scaffold template --- templates/ctl-scaffold/flake.lock | 281 ++++++++++++++-------- templates/ctl-scaffold/flake.nix | 2 +- templates/ctl-scaffold/package-lock.json | 50 ++-- templates/ctl-scaffold/package.json | 2 +- templates/ctl-scaffold/packages.dhall | 6 +- templates/ctl-scaffold/spago-packages.nix | 18 +- 6 files changed, 220 insertions(+), 139 deletions(-) diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index 9b7a74654..2f7bd3b92 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1721915212, - "narHash": "sha256-itkbLG6DUX/L5XuoSXFPgPBf+9lFOM3ufc1T4BU4MYM=", + "lastModified": 1724915143, + "narHash": "sha256-SKluKP0iuRTYMQWzkxOtqW39+1zjw6oeZY+J8RJytGM=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "2126fa53c45842719ee38040f4d5bee8fb17a09d", + "rev": "92b3a071083372209af9c89c936f4f184ad5e3f6", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "CHaP_5": { "flake": false, "locked": { - "lastModified": 1721831314, - "narHash": "sha256-I1j5HPSbbh3l1D0C9oP/59YB4e+64K9NDRl7ueD1c/Y=", + "lastModified": 1724197463, + "narHash": "sha256-/ZHOKRX84tXckstr6rTYyjytF2yfrIpvGujRLyjZfUE=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "8815ee7598bc39a02db8896b788f69accf892790", + "rev": "610a202920ffe1d371035d35053152e9a0c77fce", "type": "github" }, "original": { @@ -716,7 +716,7 @@ "ragenix": "ragenix_3", "std": "std_6", "terranix": "terranix_3", - "utils": "utils_17" + "utils": "utils_18" }, "locked": { "lastModified": 1661790449, @@ -815,7 +815,7 @@ "ops-lib": "ops-lib_4", "ragenix": "ragenix", "terranix": "terranix_2", - "utils": "utils_12", + "utils": "utils_13", "vulnix": "vulnix" }, "locked": { @@ -849,7 +849,7 @@ "ops-lib": "ops-lib_6", "ragenix": "ragenix_4", "terranix": "terranix_4", - "utils": "utils_26", + "utils": "utils_27", "vulnix": "vulnix_2" }, "locked": { @@ -2069,6 +2069,7 @@ "cardano-db-sync": "cardano-db-sync", "cardano-node-8.1.1": "cardano-node-8.1.1", "cardano-node-8.7.3": "cardano-node-8.7.3", + "crane": "crane_2", "devour-flake": "devour-flake", "devshell": "devshell_4", "flake-parts": "flake-parts_5", @@ -2078,15 +2079,16 @@ "ctl", "nixpkgs" ], + "oura": "oura", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1722438671, - "narHash": "sha256-Nb8bROKPjRWFMsaHIK4BOvsTceL9klpF3Ucp/zHqRzM=", + "lastModified": 1724967699, + "narHash": "sha256-rsj28Jq7DX/YCzykfvy2LJ9y6AE37i3MCyoAFeRHyEM=", "owner": "mlabs-haskell", "repo": "cardano.nix", - "rev": "7e696a77440d14f161c8b426d90fecfdb70ad8d8", + "rev": "3eb9384b2e1c43d4dcdf2eb23d0210d5d7e612af", "type": "github" }, "original": { @@ -2121,20 +2123,20 @@ ], "ops-lib": "ops-lib_3", "std": "std_5", - "utils": "utils_7" + "utils": "utils_8" }, "locked": { - "lastModified": 1722955151, - "narHash": "sha256-pZUg2PbhK35QdMcEP0or6IyKXBr544KyebQ+xiNc6PE=", + "lastModified": 1724944858, + "narHash": "sha256-7zV11vZ4e81cDIpk9OpkAnYV9EA5WWH134iei3n8+S8=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "4f4e372a1641ac68cd09fb0339e6f55bef1ab85d", + "rev": "d7abccd4e90c38ff5cd4d6a7839689d888332056", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "cardano-node", - "rev": "4f4e372a1641ac68cd09fb0339e6f55bef1ab85d", + "rev": "d7abccd4e90c38ff5cd4d6a7839689d888332056", "type": "github" } }, @@ -2590,7 +2592,7 @@ "nix-cache-proxy": "nix-cache-proxy", "nixpkgs": "nixpkgs_68", "poetry2nix": "poetry2nix", - "utils": "utils_21" + "utils": "utils_22" }, "locked": { "lastModified": 1647522107, @@ -2662,6 +2664,28 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "ctl", + "cardano-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721058578, + "narHash": "sha256-fs/PVa3H5dS1//4BjecWi3nitXm5fRObx0JxXIAo+JA=", + "owner": "ipetkov", + "repo": "crane", + "rev": "17e5109bb1d9fb393d70fba80988f7d70d1ded1a", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "crystal": { "inputs": { "ameba-src": "ameba-src", @@ -2781,17 +2805,17 @@ "ogmios": "ogmios_2" }, "locked": { - "lastModified": 1725554236, - "narHash": "sha256-KVOytx/7s9J0zZuN9Cb34VXBC17b8hclpBdZnwhIb3Q=", + "lastModified": 1731948579, + "narHash": "sha256-JP+P2IQg6tIIGb9T2+ZUzz4VjT9L067JNaUzfym3exQ=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "c55856ce2bd191e522329718bd5324107e4f97f4", + "rev": "f70a82f551d1aa4065312695784536d9fecbc947", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "c55856ce2bd191e522329718bd5324107e4f97f4", + "rev": "f70a82f551d1aa4065312695784536d9fecbc947", "type": "github" } }, @@ -2936,7 +2960,7 @@ "haskellNix", "nixpkgs-unstable" ], - "utils": "utils_28" + "utils": "utils_29" }, "locked": { "lastModified": 1670313550, @@ -2968,7 +2992,7 @@ "fenix", "nixpkgs" ], - "utils": "utils_8" + "utils": "utils_9" }, "locked": { "lastModified": 1638318651, @@ -2997,7 +3021,7 @@ "fenix", "nixpkgs" ], - "utils": "utils_14" + "utils": "utils_15" }, "locked": { "lastModified": 1638318651, @@ -3027,7 +3051,7 @@ "fenix", "nixpkgs" ], - "utils": "utils_22" + "utils": "utils_23" }, "locked": { "lastModified": 1638318651, @@ -3736,7 +3760,7 @@ "cicero", "nixpkgs" ], - "utils": "utils_18" + "utils": "utils_19" }, "locked": { "lastModified": 1644418487, @@ -5430,7 +5454,7 @@ "cicero", "nixpkgs" ], - "utils": "utils_19" + "utils": "utils_20" }, "locked": { "lastModified": 1642008295, @@ -5791,7 +5815,7 @@ "gomod2nix_3": { "inputs": { "nixpkgs": "nixpkgs_31", - "utils": "utils_6" + "utils": "utils_7" }, "locked": { "lastModified": 1655245309, @@ -5826,11 +5850,11 @@ "hackage-nix": { "flake": false, "locked": { - "lastModified": 1721953589, - "narHash": "sha256-ctYOxCvXQS5MPILV8YPyUhylKhgIhOM4Dc5g0vGNFbM=", + "lastModified": 1724977850, + "narHash": "sha256-awqEskjcqDqrT+Xgl9GK8LCPfxtzuwoLH12nbVoOjT8=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "3f0675337984f15834fcd52b97fc766e30f4d684", + "rev": "7007cb02b7b0333f7e2c33dd8b5d1de5105d36b4", "type": "github" }, "original": { @@ -5890,11 +5914,11 @@ "hackageNix_4": { "flake": false, "locked": { - "lastModified": 1719794527, - "narHash": "sha256-qHo/KumtwAzPkfLWODu/6EFY/LeK+C7iPJyAUdT8tGA=", + "lastModified": 1724200761, + "narHash": "sha256-IDenOlZc5aph7Jz6xNQXGNnnx896hUYrsRU8mbE4bVw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "da2a3bc9bd1b3dd41bb147279529c471c615fd3e", + "rev": "11b43aaf3ff8018897f1b84a3fb60cce9ae7056d", "type": "github" }, "original": { @@ -6154,7 +6178,7 @@ "hls-2.6": "hls-2.6_2", "hls-2.7": "hls-2.7_2", "hls-2.8": "hls-2.8_2", - "hls-2.9": "hls-2.9", + "hls-2.9": "hls-2.9_2", "hpc-coveralls": "hpc-coveralls_10", "hydra": "hydra_12", "iserv-proxy": "iserv-proxy_6", @@ -6175,11 +6199,11 @@ "stackage": "stackage_9" }, "locked": { - "lastModified": 1721956799, - "narHash": "sha256-FU09PlekhkuocxDO2UN2aARdUflIGA36VP1EUra4b7c=", + "lastModified": 1724979052, + "narHash": "sha256-hoL0ofZI4L6w4413Wr4eZkMZzj+TyyDXF84FxEjppxU=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "ccbd8ed7d4aff11e0507d19dc7c40601487c0bea", + "rev": "5837bf2e6dbbbc2fc60fe7d27c9a03d9f8e9e974", "type": "github" }, "original": { @@ -6373,6 +6397,7 @@ "hls-2.6": "hls-2.6", "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls_5", "hydra": "hydra_5", "iserv-proxy": "iserv-proxy_5", @@ -6564,11 +6589,11 @@ "nixpkgs": "nixpkgs_99" }, "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", + "lastModified": 1724947644, + "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", + "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "type": "github" }, "original": { @@ -7105,6 +7130,23 @@ } }, "hls-2.9": { + "flake": false, + "locked": { + "lastModified": 1718469202, + "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.9.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.9_2": { "flake": false, "locked": { "lastModified": 1718469202, @@ -7954,7 +7996,7 @@ "devshell": "devshell_8", "inclusive": "inclusive_4", "nixpkgs": "nixpkgs_51", - "utils": "utils_13" + "utils": "utils_14" }, "locked": { "lastModified": 1652212694, @@ -7975,7 +8017,7 @@ "devshell": "devshell_18", "inclusive": "inclusive_12", "nixpkgs": "nixpkgs_80", - "utils": "utils_27" + "utils": "utils_28" }, "locked": { "lastModified": 1658302707, @@ -8918,7 +8960,7 @@ "cicero", "nixpkgs" ], - "utils": "utils_20" + "utils": "utils_21" }, "locked": { "lastModified": 1644317729, @@ -10808,11 +10850,11 @@ }, "nixpkgs-arion": { "locked": { - "lastModified": 1721996520, - "narHash": "sha256-R/d5Af+YT2i6/QlGKQ4mZt/kziI1D6KTXumRWkbX/+s=", + "lastModified": 1725022733, + "narHash": "sha256-M6tvBPNDilgXLh9Bfv4U0ih+TyrQReeYOLkY+U2idy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3ac4d9337a8be63e48a38583c5978627f4daeb", + "rev": "79eb73f1c49fdfdf75f00b1ee086366380fbc323", "type": "github" }, "original": { @@ -12956,7 +12998,7 @@ "inputs": { "nix": "nix_8", "nixpkgs": "nixpkgs_46", - "utils": "utils_9" + "utils": "utils_10" }, "locked": { "lastModified": 1648128770, @@ -12979,7 +13021,7 @@ "inclusive": "inclusive_2", "nix": "nix_9", "nixpkgs": "nixpkgs_48", - "utils": "utils_10" + "utils": "utils_11" }, "locked": { "lastModified": 1648029666, @@ -13001,7 +13043,7 @@ "inclusive": "inclusive_5", "nix": "nix_11", "nixpkgs": "nixpkgs_60", - "utils": "utils_15" + "utils": "utils_16" }, "locked": { "lastModified": 1648029666, @@ -13023,7 +13065,7 @@ "inclusive": "inclusive_10", "nix": "nix_16", "nixpkgs": "nixpkgs_77", - "utils": "utils_24" + "utils": "utils_25" }, "locked": { "lastModified": 1648029666, @@ -13044,7 +13086,7 @@ "devshell": "devshell_7", "inclusive": "inclusive_3", "nixpkgs": "nixpkgs_49", - "utils": "utils_11" + "utils": "utils_12" }, "locked": { "lastModified": 1649836589, @@ -13065,7 +13107,7 @@ "devshell": "devshell_10", "inclusive": "inclusive_6", "nixpkgs": "nixpkgs_61", - "utils": "utils_16" + "utils": "utils_17" }, "locked": { "lastModified": 1658244176, @@ -13086,7 +13128,7 @@ "devshell": "devshell_17", "inclusive": "inclusive_11", "nixpkgs": "nixpkgs_78", - "utils": "utils_25" + "utils": "utils_26" }, "locked": { "lastModified": 1649836589, @@ -13106,7 +13148,7 @@ "inputs": { "nix": "nix_15", "nixpkgs": "nixpkgs_75", - "utils": "utils_23" + "utils": "utils_24" }, "locked": { "lastModified": 1648128770, @@ -13500,6 +13542,30 @@ "type": "github" } }, + "oura": { + "inputs": { + "crane": [ + "ctl", + "cardano-nix", + "crane" + ], + "utils": "utils_6" + }, + "locked": { + "lastModified": 1720226386, + "narHash": "sha256-oBvHLxWM2vN351flm7jWjwuatFEK6la/nX9fHNy9/hk=", + "owner": "txpipe", + "repo": "oura", + "rev": "d94068562d98f43aeef8e224111fbdaeb2bc186c", + "type": "github" + }, + "original": { + "owner": "txpipe", + "ref": "v1.8.6", + "repo": "oura", + "type": "github" + } + }, "paisano": { "inputs": { "nixpkgs": [ @@ -14680,11 +14746,11 @@ "stackage_9": { "flake": false, "locked": { - "lastModified": 1721952692, - "narHash": "sha256-UXiGzFWWOZMZRYkhS0oVaNK/v8Rr5PxxsM2qV1T6iJI=", + "lastModified": 1724717508, + "narHash": "sha256-FeGR8x/iFDB6zmu3pjRFVcXc6gD/jEct/aM1kZF9gWs=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "73bfeeb1dccad2858f22f6f57b6571b10579ed2e", + "rev": "3cdad9ccd2f0232659e147b16ca979d08f77e63e", "type": "github" }, "original": { @@ -15716,6 +15782,21 @@ } }, "utils_10": { + "locked": { + "lastModified": 1601282935, + "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15730,7 +15811,7 @@ "type": "github" } }, - "utils_11": { + "utils_12": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15745,7 +15826,7 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -15760,7 +15841,7 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15775,7 +15856,7 @@ "type": "github" } }, - "utils_14": { + "utils_15": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -15790,7 +15871,7 @@ "type": "github" } }, - "utils_15": { + "utils_16": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15805,7 +15886,7 @@ "type": "github" } }, - "utils_16": { + "utils_17": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15820,7 +15901,7 @@ "type": "github" } }, - "utils_17": { + "utils_18": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -15835,21 +15916,6 @@ "type": "github" } }, - "utils_18": { - "locked": { - "lastModified": 1633020561, - "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", - "owner": "kreisys", - "repo": "flake-utils", - "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", - "type": "github" - }, - "original": { - "owner": "kreisys", - "repo": "flake-utils", - "type": "github" - } - }, "utils_19": { "locked": { "lastModified": 1633020561, @@ -15896,6 +15962,21 @@ } }, "utils_21": { + "locked": { + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", + "repo": "flake-utils", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", + "type": "github" + }, + "original": { + "owner": "kreisys", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_22": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -15910,7 +15991,7 @@ "type": "github" } }, - "utils_22": { + "utils_23": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -15925,7 +16006,7 @@ "type": "github" } }, - "utils_23": { + "utils_24": { "locked": { "lastModified": 1601282935, "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", @@ -15940,7 +16021,7 @@ "type": "github" } }, - "utils_24": { + "utils_25": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15955,7 +16036,7 @@ "type": "github" } }, - "utils_25": { + "utils_26": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -15970,7 +16051,7 @@ "type": "github" } }, - "utils_26": { + "utils_27": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -15985,7 +16066,7 @@ "type": "github" } }, - "utils_27": { + "utils_28": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -16000,7 +16081,7 @@ "type": "github" } }, - "utils_28": { + "utils_29": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -16076,15 +16157,12 @@ } }, "utils_7": { - "inputs": { - "systems": "systems_6" - }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -16094,12 +16172,15 @@ } }, "utils_8": { + "inputs": { + "systems": "systems_6" + }, "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -16110,11 +16191,11 @@ }, "utils_9": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index 219436708..4e2fd8f17 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -16,7 +16,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "c55856ce2bd191e522329718bd5324107e4f97f4"; + rev = "f70a82f551d1aa4065312695784536d9fecbc947"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index 4790ea640..a35cae523 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@mlabs-haskell/cardano-message-signing": "^1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc": "12.0.0", + "@mlabs-haskell/cardano-serialization-lib-gc": "13.2.0", "@mlabs-haskell/json-bigint": "2.0.0", "@mlabs-haskell/uplc-apply-args": "1.0.29-alpha", "@noble/secp256k1": "^1.7.0", @@ -58,14 +58,14 @@ "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, "node_modules/@emurgo/cardano-serialization-lib-browser": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-12.0.0.tgz", - "integrity": "sha512-sAVjtaSwujQ3WaJY7OnsOt9mGbMF6YVFg/D4SWLr666zo3ESmislH0FLD932yFTOSJtOQV1oF+Pk8Ee2lR7X5A==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-13.2.0.tgz", + "integrity": "sha512-IOUETh9txYfXoTLaX3Ut71UcLtWpFL0ewBNDltgnGKE6k9qM0CurFR8tSoAE1i0IvTi/v/oIZX2oqXex/Si65Q==" }, "node_modules/@emurgo/cardano-serialization-lib-nodejs": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0.tgz", - "integrity": "sha512-r7ZFYMr1N/i2GbhPAmz7JjKhfjEu7q8sa5beX2rLoV+xTkKGfknCTOsVvT0LqgKOUXAzcSQhNNHUKFd27+sLiw==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-13.2.0.tgz", + "integrity": "sha512-Bz1zLGEqBQ0BVkqt1OgMxdBOE3BdUWUd7Ly9Ecr/aUwkA8AV1w1XzBMe4xblmJHnB1XXNlPH4SraXCvO+q0Mig==" }, "node_modules/@esbuild/android-arm": { "version": "0.18.11", @@ -499,13 +499,13 @@ } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-12.0.0.tgz", - "integrity": "sha512-8qwkJzDV1CEjbpZZ3sX5gkP6Tug0mzBSeO9ppHBT6wFEqyi5HXA5oxmN0TGoFecvWVG5f6JmRVeBS0sDqsi20A==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-13.2.0.tgz", + "integrity": "sha512-FOuGiv7k/G8g/+IRmDFLcpmpBb1rKoy5RhNGxcD+csL6una69LIuRwEyp9rDDcNxw9MSe88DLX0EHjq6PQ/bHA==", "dependencies": { - "@emurgo/cardano-serialization-lib-browser": "12.0.0", - "@emurgo/cardano-serialization-lib-nodejs": "12.0.0", - "@mlabs-haskell/csl-gc-wrapper": "^1.0.2" + "@emurgo/cardano-serialization-lib-browser": "13.2.0", + "@emurgo/cardano-serialization-lib-nodejs": "13.2.0", + "@mlabs-haskell/csl-gc-wrapper": "1.0.2" } }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { @@ -5518,14 +5518,14 @@ "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, "@emurgo/cardano-serialization-lib-browser": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-12.0.0.tgz", - "integrity": "sha512-sAVjtaSwujQ3WaJY7OnsOt9mGbMF6YVFg/D4SWLr666zo3ESmislH0FLD932yFTOSJtOQV1oF+Pk8Ee2lR7X5A==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-13.2.0.tgz", + "integrity": "sha512-IOUETh9txYfXoTLaX3Ut71UcLtWpFL0ewBNDltgnGKE6k9qM0CurFR8tSoAE1i0IvTi/v/oIZX2oqXex/Si65Q==" }, "@emurgo/cardano-serialization-lib-nodejs": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0.tgz", - "integrity": "sha512-r7ZFYMr1N/i2GbhPAmz7JjKhfjEu7q8sa5beX2rLoV+xTkKGfknCTOsVvT0LqgKOUXAzcSQhNNHUKFd27+sLiw==" + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-13.2.0.tgz", + "integrity": "sha512-Bz1zLGEqBQ0BVkqt1OgMxdBOE3BdUWUd7Ly9Ecr/aUwkA8AV1w1XzBMe4xblmJHnB1XXNlPH4SraXCvO+q0Mig==" }, "@esbuild/android-arm": { "version": "0.18.11", @@ -5752,13 +5752,13 @@ } }, "@mlabs-haskell/cardano-serialization-lib-gc": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-12.0.0.tgz", - "integrity": "sha512-8qwkJzDV1CEjbpZZ3sX5gkP6Tug0mzBSeO9ppHBT6wFEqyi5HXA5oxmN0TGoFecvWVG5f6JmRVeBS0sDqsi20A==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-13.2.0.tgz", + "integrity": "sha512-FOuGiv7k/G8g/+IRmDFLcpmpBb1rKoy5RhNGxcD+csL6una69LIuRwEyp9rDDcNxw9MSe88DLX0EHjq6PQ/bHA==", "requires": { - "@emurgo/cardano-serialization-lib-browser": "12.0.0", - "@emurgo/cardano-serialization-lib-nodejs": "12.0.0", - "@mlabs-haskell/csl-gc-wrapper": "^1.0.2" + "@emurgo/cardano-serialization-lib-browser": "13.2.0", + "@emurgo/cardano-serialization-lib-nodejs": "13.2.0", + "@mlabs-haskell/csl-gc-wrapper": "1.0.2" } }, "@mlabs-haskell/csl-gc-wrapper": { diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index b4f267727..214db1e88 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -26,7 +26,7 @@ "license": "MIT", "dependencies": { "@mlabs-haskell/cardano-message-signing": "^1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc": "12.0.0", + "@mlabs-haskell/cardano-serialization-lib-gc": "13.2.0", "@mlabs-haskell/json-bigint": "2.0.0", "@mlabs-haskell/uplc-apply-args": "1.0.29-alpha", "@noble/secp256k1": "^1.7.0", diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 0aa1c50e4..6d6d86e35 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -214,7 +214,7 @@ let additions = ] , repo = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib" - , version = "v2.0.0" + , version = "v3.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 = "v3.0.0" + , version = "v4.0.0" } , cardano-message-signing = { dependencies = @@ -584,7 +584,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "c55856ce2bd191e522329718bd5324107e4f97f4" + , version = "f70a82f551d1aa4065312695784536d9fecbc947" } } diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 3c7baf126..f6d0ff536 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -271,11 +271,11 @@ let "cardano-serialization-lib" = pkgs.stdenv.mkDerivation { name = "cardano-serialization-lib"; - version = "v2.0.0"; + version = "v3.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib"; - rev = "d6ca2f9463b3d4e1cfa98e9964edbe7bfed02905"; - sha256 = "05f26v1xr7lkiw57rcqhjng299p7ly90wxqq9jay743pwvrysq0b"; + rev = "5865fddad045566ca2192526a7de355c59629000"; + sha256 = "18824bw5hczhm8wgg7n668fnx2bx0211ykj4dwnw2d7zxw1jm2z4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -295,11 +295,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "c55856ce2bd191e522329718bd5324107e4f97f4"; + version = "f70a82f551d1aa4065312695784536d9fecbc947"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "c55856ce2bd191e522329718bd5324107e4f97f4"; - sha256 = "0x3g9049yn8plhjigwnvbq5w2mg1ywkg93cvrmsd5czv3yvv4lr9"; + rev = "f70a82f551d1aa4065312695784536d9fecbc947"; + sha256 = "053vnwlpycx56p4sxlsb7y6iagngakkdnlxz344d5si0hkc8zzr4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -307,11 +307,11 @@ let "cardano-types" = pkgs.stdenv.mkDerivation { name = "cardano-types"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-types"; - rev = "71b204c7c9c83b8280ed3ed14837d76b8ac0a6fe"; - sha256 = "1kffscail4kp5pygdv8nd2bclwd6c0cygkn5mn5sllnn29a63mpf"; + rev = "46cc078af59926c566a38307cd34c40049e7880c"; + sha256 = "1m7asca6qsc8sd2lzp6ahiyxms1cvs5nqzwl5s2wwd3h4fv7w7cy"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From c6c981b0bd573b1b7da0adad1a76bb61a07aa177 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuiski Date: Mon, 18 Nov 2024 18:08:24 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c10b16ecc..f8c7601df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,46 +8,47 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [[Unreleased]](#unreleased) + - [Changed](#changed) - [Fixed](#fixed) - [[v9.3.1]](#v931) - [Fixed](#fixed-1) - [[v9.3.0]](#v930) - [Fixed](#fixed-2) - - [Changed](#changed) + - [Changed](#changed-1) - [[v9.2.0]](#v920) - [Added](#added) - - [Changed](#changed-1) + - [Changed](#changed-2) - [Removed](#removed) - [Fixed](#fixed-3) - [[v9.1.0]](#v910) - [Added](#added-1) - - [Changed](#changed-2) + - [Changed](#changed-3) - [Removed](#removed-1) - [Fixed](#fixed-4) - [[v9.0.0]](#v900) - [Deprecated](#deprecated) - [Added](#added-2) - [Removed](#removed-2) - - [Changed](#changed-3) + - [Changed](#changed-4) - [Fixed](#fixed-5) - [[v8.0.0]](#v800) - [Added](#added-3) - - [Changed](#changed-4) + - [Changed](#changed-5) - [Fixed](#fixed-6) - [Removed](#removed-3) - [[v7.0.0]](#v700) - [Added](#added-4) - - [Changed](#changed-5) + - [Changed](#changed-6) - [Fixed](#fixed-7) - [Removed](#removed-4) - [[v6.0.0]](#v600) - [Added](#added-5) - - [Changed](#changed-6) + - [Changed](#changed-7) - [Fixed](#fixed-8) - [Removed](#removed-5) - [[v5.0.0]](#v500) - [Added](#added-6) - - [Changed](#changed-7) + - [Changed](#changed-8) - [Removed](#removed-6) - [Fixed](#fixed-9) - [Runtime Dependencies](#runtime-dependencies) @@ -57,25 +58,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [Added](#added-7) - [[v4.0.0] - 2022-12-15](#v400---2022-12-15) - [Added](#added-8) - - [Changed](#changed-8) + - [Changed](#changed-9) - [Removed](#removed-7) - [Fixed](#fixed-11) - [Runtime Dependencies](#runtime-dependencies-1) - [[3.0.0] - 2022-11-21](#300---2022-11-21) - [Added](#added-9) - - [Changed](#changed-9) + - [Changed](#changed-10) - [Removed](#removed-8) - [Fixed](#fixed-12) - [Runtime Dependencies](#runtime-dependencies-2) - [[2.0.0] - 2022-09-12](#200---2022-09-12) - [Added](#added-10) - - [Changed](#changed-10) + - [Changed](#changed-11) - [Removed](#removed-9) - [Fixed](#fixed-13) - [[2.0.0-alpha] - 2022-07-05](#200-alpha---2022-07-05) - [Added](#added-11) - [Removed](#removed-10) - - [Changed](#changed-11) + - [Changed](#changed-12) - [Fixed](#fixed-14) - [[1.1.0] - 2022-06-30](#110---2022-06-30) - [Fixed](#fixed-15) @@ -87,9 +88,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## [Unreleased] +### Changed + +- `cardano-serialization-lib` has been updated to `v13.2.0` ([#1656](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1656)) + ### Fixed - Fixed transaction witness set 'attach' functions. Previously, the updated witness set was incorrectly appended to the existing set, causing performance degradation when processing constraints for complex transactions. ([#1653](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1653)) +- Updating to CSL `v13.2.0` should resolve the issue of occasional transaction script integrity hash mismatches on tx submission ([#1656](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1656)) ## [v9.3.1]