From 5474fcf74cf69c66a5d31954c1861e0a56db8955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= Date: Thu, 16 Apr 2026 09:21:49 +0100 Subject: [PATCH 1/3] Update CIPs reference --- .github/workflows/haskell-ci.yml | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 4052ac74..b25be2c9 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -165,7 +165,7 @@ jobs: uses: actions/checkout@v6 with: repository: tweag/CIPs - ref: 5a4f49835b01695583830e01e2dfd11e9e582efc + ref: c92a3b5db78268e7f0db5f24c80ed6f49cf4b149 path: cips - name: set env for reference CDDL run: | diff --git a/flake.lock b/flake.lock index bd5fde29..06ea2a99 100644 --- a/flake.lock +++ b/flake.lock @@ -69,17 +69,17 @@ "cips": { "flake": false, "locked": { - "lastModified": 1774517331, - "narHash": "sha256-Iu6jgcoa/WZcruKaym/3Y5/1awx53eKgvI0l6/+fMIQ=", + "lastModified": 1776254122, + "narHash": "sha256-MmXsGDMGnZayYZEt40Y5a54Pis31plBQt2/hbdUTaos=", "owner": "tweag", "repo": "CIPs", - "rev": "5a4f49835b01695583830e01e2dfd11e9e582efc", + "rev": "c92a3b5db78268e7f0db5f24c80ed6f49cf4b149", "type": "github" }, "original": { "owner": "tweag", "repo": "CIPs", - "rev": "5a4f49835b01695583830e01e2dfd11e9e582efc", + "rev": "c92a3b5db78268e7f0db5f24c80ed6f49cf4b149", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 59874068..ab2381f8 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; inputs.cips = { - url = "github:tweag/CIPs?rev=5a4f49835b01695583830e01e2dfd11e9e582efc"; + url = "github:tweag/CIPs?rev=c92a3b5db78268e7f0db5f24c80ed6f49cf4b149"; flake = false; }; outputs = { self, nixpkgs, flake-utils, haskellNix, git-hooks, treefmt-nix From cc17f0bbfdff66cc94d5b59e260cfa8dddb725cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= Date: Mon, 13 Apr 2026 17:48:06 +0100 Subject: [PATCH 2/3] Update record_entry rule to include word64 in gov/proposals/v0 namespace --- .github/workflows/haskell-ci.yml | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- .../cddl-src/Cardano/SCLS/Namespace/GovProposals.hs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b25be2c9..84910220 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -165,7 +165,7 @@ jobs: uses: actions/checkout@v6 with: repository: tweag/CIPs - ref: c92a3b5db78268e7f0db5f24c80ed6f49cf4b149 + ref: 281cccd9e5c7eaf30b9e5cef69062aefcc4822db path: cips - name: set env for reference CDDL run: | diff --git a/flake.lock b/flake.lock index 06ea2a99..be1dafbd 100644 --- a/flake.lock +++ b/flake.lock @@ -69,17 +69,17 @@ "cips": { "flake": false, "locked": { - "lastModified": 1776254122, - "narHash": "sha256-MmXsGDMGnZayYZEt40Y5a54Pis31plBQt2/hbdUTaos=", + "lastModified": 1776254123, + "narHash": "sha256-uTm+6vCEPhVgksUTtmFqF7YAwrY+XPAfM1XTiVNyeTc=", "owner": "tweag", "repo": "CIPs", - "rev": "c92a3b5db78268e7f0db5f24c80ed6f49cf4b149", + "rev": "281cccd9e5c7eaf30b9e5cef69062aefcc4822db", "type": "github" }, "original": { "owner": "tweag", "repo": "CIPs", - "rev": "c92a3b5db78268e7f0db5f24c80ed6f49cf4b149", + "rev": "281cccd9e5c7eaf30b9e5cef69062aefcc4822db", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ab2381f8..022a762d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; inputs.cips = { - url = "github:tweag/CIPs?rev=c92a3b5db78268e7f0db5f24c80ed6f49cf4b149"; + url = "github:tweag/CIPs?rev=281cccd9e5c7eaf30b9e5cef69062aefcc4822db"; flake = false; }; outputs = { self, nixpkgs, flake-utils, haskellNix, git-hooks, treefmt-nix diff --git a/scls-cardano/cddl-src/Cardano/SCLS/Namespace/GovProposals.hs b/scls-cardano/cddl-src/Cardano/SCLS/Namespace/GovProposals.hs index 5a51c6a0..aa074f54 100644 --- a/scls-cardano/cddl-src/Cardano/SCLS/Namespace/GovProposals.hs +++ b/scls-cardano/cddl-src/Cardano/SCLS/Namespace/GovProposals.hs @@ -47,7 +47,7 @@ record_entry = | ``` | |] - $ "record_entry" =:= proposal + $ "record_entry" =:= arr [a word64, a proposal] committee_cold_credential :: Rule committee_cold_credential = "committee_cold_credential" =:= credential From 4d68c61002689b77730d859944dc48bf7bf2f00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= Date: Mon, 27 Apr 2026 09:47:18 +0100 Subject: [PATCH 3/3] Update gov/proposals/v0 namespace key size comment for clarity --- scls-cardano/cddl-src/Cardano/SCLS/CDDL.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scls-cardano/cddl-src/Cardano/SCLS/CDDL.hs b/scls-cardano/cddl-src/Cardano/SCLS/CDDL.hs index d8ccbcc3..8026b189 100644 --- a/scls-cardano/cddl-src/Cardano/SCLS/CDDL.hs +++ b/scls-cardano/cddl-src/Cardano/SCLS/CDDL.hs @@ -99,4 +99,4 @@ type instance Spec.NamespaceKeySize "entities/committee/v0" = 8 type instance Spec.NamespaceKeySize "gov/committee/v0" = 8 type instance Spec.NamespaceKeySize "gov/constitution/v0" = 8 type instance Spec.NamespaceKeySize "gov/pparams/v0" = 4 -type instance Spec.NamespaceKeySize "gov/proposals/v0" = 34 -- 32 bytes txid+tx index + 2 bytes for proposal index +type instance Spec.NamespaceKeySize "gov/proposals/v0" = 34 -- 28 bytes txid, 4 bytes tx index, 2 bytes for proposal index