Merge branch 'main' into dependabot/github_actions/actions/cache-4

.github/workflows/check-changelog.yml

@@ -11,7 +11,7 @@ jobs:
 
       - name: Find Changed Files in changelog.d
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v43
         with:
           files: '**/changelog.d/**'
 

.github/workflows/deploy.yml

@@ -24,10 +24,10 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           install_url: https://releases.nixos.org/nix/nix-2.10.3/install

.github/workflows/nightly.yml

@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           install_url: https://releases.nixos.org/nix/nix-2.10.3/install
@@ -55,7 +55,7 @@ jobs:
             experimental-features = nix-command flakes
 
       - name: Setup Cachix
-        uses: cachix/cachix-action@v12
+        uses: cachix/cachix-action@v14
         with:
           name: ${{ env.CACHE_NAME }}
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Checkout the code
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           install_url: https://releases.nixos.org/nix/nix-2.10.3/install
@@ -38,7 +38,7 @@ jobs:
             substituters = ${{ env.SUBSTITUTERS }}
             experimental-features = nix-command flakes
       - name: Setup Cachix
-        uses: cachix/cachix-action@v12
+        uses: cachix/cachix-action@v14
         with:
           name: ${{ env.CACHE_NAME }}
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

cabal.project

@@ -1,5 +1,5 @@
 repository cardano-haskell-packages
-  url: https://input-output-hk.github.io/cardano-haskell-packages
+  url: https://chap.intersectmbo.org/
   secure: True
   root-keys:
     3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
@@ -14,10 +14,10 @@ repository cardano-haskell-packages
 -- We duplicate the hackage index-state first for haskell.nix, even though cabal ignores it.
 -- This must always match the hackage index-state on the next line.
 -- See https://github.com/input-output-hk/haskell.nix/issues/1869#issuecomment-1449272480
-index-state: 2024-02-01T00:00:00Z
+index-state: 2024-03-07T07:48:20Z
 index-state:
-  , hackage.haskell.org      2024-02-01T00:00:00Z
-  , cardano-haskell-packages 2024-02-01T00:00:00Z
+  , hackage.haskell.org 2024-03-07T07:48:20Z
+  , cardano-haskell-packages 2024-03-05T10:16:08Z
 
 packages:
   async-components
@@ -194,14 +194,6 @@ source-repository-package
   --sha256: sha256-69iE7LrigHTSKJrgq6uGU+U4j+NtBwR4ae18vsLyVvI=
   subdir: core
 
--- These constraints needed for plutus-apps
-constraints:
-  -- 0.3.6.2 switched from cryptonite to crypton, and this causes linker
-  -- failures when other packages depend on cryptonite.
-  -- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508
-  http-client-tls < 0.3.6.2,
-  ouroboros-network-framework ==0.10.1.0
-
 allow-newer:
   primitive,
   optparse-applicative
@@ -222,10 +214,14 @@ source-repository-package
            isabelle
    --sha256: 1yfbv9bwr71jd2sqfsb5jjq6j5bjfbjpp946fbkhxwwc2npwj0pd
 
-
+-- Note (by Nicolas Henin) : To remove when using a version > 1.21 
+-- (this is 1.21 + this commit `Revert IntersectMBO#5677 (More efficient Value.geq and leq)` cherry-picked from 1.22 )  
 source-repository-package
    type: git
-   location: https://github.com/intersectMBO/cardano-api
-   tag: 8a539a8e63d8c410a329e3bc028d8339f32e4c8f
-   subdir: cardano-api
-   --sha256: 0r2zi4is8ayjryq80b144zcfl95ylx60gjp9n1qdcr1hcyrm76aj
+   location: https://github.com/nhenin/plutus
+   tag: 7bb9f70558c27d58195cf4670aa758a72d4e2319
+   subdir: plutus-core 
+           plutus-ledger-api
+           plutus-tx
+           plutus-tx-plugin 
+   --sha256: 0z4fv2pc0d2rpfivl146pwgq3y5kjxw6w9c8rqi154nab1l3614a

configuration/conway-babbage-test-genesis.json

@@ -1,36 +1,38 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0.51,
-    "pvtCommitteeNoConfidence": 0.51,
-    "pvtHardForkInitiation": 0.51,
-    "pvtMotionNoConfidence": 0.51
+    "committeeNormal": 0.51,
+    "committeeNoConfidence": 0.51,
+    "hardForkInitiation": 0.51,
+    "motionNoConfidence": 0.51,
+    "ppSecurityGroup": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0.51,
-    "dvtCommitteeNormal": 0.51,
-    "dvtCommitteeNoConfidence": 0.51,
-    "dvtUpdateToConstitution": 0.51,
-    "dvtHardForkInitiation": 0.51,
-    "dvtPPNetworkGroup": 0.51,
-    "dvtPPEconomicGroup": 0.51,
-    "dvtPPTechnicalGroup": 0.51,
-    "dvtPPGovGroup": 0.51,
-    "dvtTreasuryWithdrawal": 0.51
+    "motionNoConfidence": 0.51,
+    "committeeNormal": 0.51,
+    "committeeNoConfidence": 0.51,
+    "updateToConstitution": 0.51,
+    "hardForkInitiation": 0.51,
+    "ppNetworkGroup": 0.51,
+    "ppEconomicGroup": 0.51,
+    "ppTechnicalGroup": 0.51,
+    "ppGovGroup": 0.51,
+    "treasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 60,
-  "govActionLifetime": 14,
-  "govActionDeposit": 0,
-  "dRepDeposit": 0,
-  "dRepActivity": 0,
+  "committeeMaxTermLength": 200,
+  "govActionLifetime": 10,
+  "govActionDeposit": 1000000000,
+  "dRepDeposit": 2000000,
+  "dRepActivity": 20,
   "constitution": {
     "anchor": {
       "url": "",
       "dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
     }
   },
   "committee": {
-    "members": {},
+    "members": {
+    },
     "quorum": 0
   }
 }

deploy/marlowe-oracle/values.yaml

@@ -3,4 +3,4 @@ networks:
   - preprod
   # Reach out to dev empowerment to add secrets for new environments when needed
 images:
-  stagingTag: ff1bb278
+  stagingTag: 79815d94

deploy/marlowe-runtime/values.yaml

@@ -5,8 +5,8 @@ networks:
 instances:
   qa:
     parentDomain: scdev.aws.iohkdev.io
-    webTag: ff1bb278
-    tag: ff1bb278
+    webTag: 79815d94
+    tag: 79815d94
     repo: ghcr.io
     org: input-output-hk
     cardanoNode: cardano-node-873