From e86ae1246abe138b64a9dc5e57420005878900c8 Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Thu, 23 Jun 2022 18:27:24 +0800 Subject: [PATCH 1/4] bump `liqwid-plutarch-extra` --- flake.lock | 1960 +++++++++++++++++++++++++++++++++++++++++----------- flake.nix | 2 +- 2 files changed, 1549 insertions(+), 413 deletions(-) diff --git a/flake.lock b/flake.lock index a252426..f987a5d 100644 --- a/flake.lock +++ b/flake.lock @@ -32,6 +32,22 @@ "type": "github" } }, + "HTTP_11": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "HTTP_2": { "flake": false, "locked": { @@ -210,6 +226,23 @@ "type": "github" } }, + "cabal-32_11": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, "cabal-32_2": { "flake": false, "locked": { @@ -380,6 +413,23 @@ "type": "github" } }, + "cabal-34_11": { + "flake": false, + "locked": { + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "owner": "haskell", + "repo": "cabal", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, "cabal-34_2": { "flake": false, "locked": { @@ -550,6 +600,23 @@ "type": "github" } }, + "cabal-36_11": { + "flake": false, + "locked": { + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", + "owner": "haskell", + "repo": "cabal", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, "cabal-36_2": { "flake": false, "locked": { @@ -703,6 +770,22 @@ } }, "cardano-base_10": { + "flake": false, + "locked": { + "lastModified": 1652788515, + "narHash": "sha256-l0KgomRi6YhEoOlFnBYEXhnZO2+PW68rhfUrbMXjhCQ=", + "owner": "input-output-hk", + "repo": "cardano-base", + "rev": "631cb6cf1fa01ab346233b610a38b3b4cba6e6ab", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-base", + "type": "github" + } + }, + "cardano-base_11": { "flake": false, "locked": { "lastModified": 1638456794, @@ -880,6 +963,23 @@ "type": "github" } }, + "cardano-crypto_11": { + "flake": false, + "locked": { + "lastModified": 1621376239, + "narHash": "sha256-oxIOVlgm07FAEmgGRF1C2me9TXqVxQulEOcJ22zpTRs=", + "owner": "input-output-hk", + "repo": "cardano-crypto", + "rev": "07397f0e50da97eaa0575d93bee7ac4b2b2576ec", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-crypto", + "rev": "07397f0e50da97eaa0575d93bee7ac4b2b2576ec", + "type": "github" + } + }, "cardano-crypto_2": { "flake": false, "locked": { @@ -1034,6 +1134,23 @@ } }, "cardano-prelude_10": { + "flake": false, + "locked": { + "lastModified": 1653997332, + "narHash": "sha256-E+YSfUsvxdoOr7n7fz4xd7zb4z8XBRGNYOKipc2A1pw=", + "owner": "mlabs-haskell", + "repo": "cardano-prelude", + "rev": "713c7ae79a4d538fcd653c976a652913df1567b9", + "type": "github" + }, + "original": { + "owner": "mlabs-haskell", + "repo": "cardano-prelude", + "rev": "713c7ae79a4d538fcd653c976a652913df1567b9", + "type": "github" + } + }, + "cardano-prelude_11": { "flake": false, "locked": { "lastModified": 1641566029, @@ -1218,6 +1335,22 @@ "type": "github" } }, + "cardano-repo-tool_11": { + "flake": false, + "locked": { + "lastModified": 1624584417, + "narHash": "sha256-YSepT97PagR/1jTYV/Yer8a2GjFe9+tTwaTCHxuK50M=", + "owner": "input-output-hk", + "repo": "cardano-repo-tool", + "rev": "30e826ed8f00e3e154453b122a6f3d779b2f73ec", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-repo-tool", + "type": "github" + } + }, "cardano-repo-tool_2": { "flake": false, "locked": { @@ -1378,6 +1511,22 @@ "type": "github" } }, + "cardano-shell_11": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, "cardano-shell_2": { "flake": false, "locked": { @@ -1544,6 +1693,28 @@ "type": "github" } }, + "ema_10": { + "inputs": { + "flake-compat": "flake-compat_19", + "flake-utils": "flake-utils_29", + "lint-utils": "lint-utils", + "nixpkgs": "nixpkgs_49" + }, + "locked": { + "lastModified": 1650932571, + "narHash": "sha256-rdpfJ+10a1uBPtHMNoAcpDE183RzpILRpsMgxj/YJek=", + "owner": "srid", + "repo": "ema", + "rev": "05c8a2127391ee4b593fa6541bc9078eb44ad10f", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "multisite", + "repo": "ema", + "type": "github" + } + }, "ema_2": { "inputs": { "flake-compat": "flake-compat_3", @@ -1568,8 +1739,8 @@ "ema_3": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_14" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1653742730, @@ -1695,15 +1866,14 @@ "inputs": { "flake-compat": "flake-compat_17", "flake-utils": "flake-utils_26", - "lint-utils": "lint-utils", "nixpkgs": "nixpkgs_44" }, "locked": { - "lastModified": 1650932571, - "narHash": "sha256-rdpfJ+10a1uBPtHMNoAcpDE183RzpILRpsMgxj/YJek=", + "lastModified": 1653742730, + "narHash": "sha256-NyhjoMbm3h1aTskIU6jowNClSgA92bUcGcVNPfWNWgE=", "owner": "srid", "repo": "ema", - "rev": "05c8a2127391ee4b593fa6541bc9078eb44ad10f", + "rev": "50d9499db16b4e334776d8e8cffcd144c67f9fc4", "type": "github" }, "original": { @@ -1757,12 +1927,61 @@ "type": "github" } }, + "emanote_10": { + "inputs": { + "ema": "ema_10", + "flake-compat": [ + "plutarch-safe-money", + "plutarch-numeric", + "plutarch", + "emanote", + "ema", + "flake-compat" + ], + "flake-utils": [ + "plutarch-safe-money", + "plutarch-numeric", + "plutarch", + "emanote", + "ema", + "flake-utils" + ], + "heist": "heist_10", + "ixset-typed": "ixset-typed_10", + "nixpkgs": [ + "plutarch-safe-money", + "plutarch-numeric", + "plutarch", + "emanote", + "ema", + "nixpkgs" + ], + "pandoc-link-context": "pandoc-link-context_10", + "pathtree": "pathtree", + "tailwind-haskell": "tailwind-haskell_10", + "unionmount": "unionmount" + }, + "locked": { + "lastModified": 1651699367, + "narHash": "sha256-f+whlGwxzv5Lcem+rxBgIgnkU+KcckogtWbRwZ6nM4I=", + "owner": "srid", + "repo": "emanote", + "rev": "2b6558fde2999ec22f645cb95322995b780f09f1", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "master", + "repo": "emanote", + "type": "github" + } + }, "emanote_2": { "inputs": { "ema": "ema_2", "flake-compat": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema", @@ -1770,7 +1989,7 @@ ], "flake-utils": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema", @@ -1780,7 +1999,7 @@ "ixset-typed": "ixset-typed_2", "nixpkgs": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema", @@ -1808,14 +2027,16 @@ "inputs": { "ema": "ema_3", "flake-compat": [ - "plutarch-context-builder", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", "flake-compat" ], "flake-utils": [ - "plutarch-context-builder", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -1824,7 +2045,8 @@ "heist": "heist_3", "ixset-typed": "ixset-typed_3", "nixpkgs": [ - "plutarch-context-builder", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -1852,14 +2074,14 @@ "inputs": { "ema": "ema_4", "flake-compat": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "emanote", "ema", "flake-compat" ], "flake-utils": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "emanote", "ema", @@ -1868,7 +2090,7 @@ "heist": "heist_4", "ixset-typed": "ixset-typed_4", "nixpkgs": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "emanote", "ema", @@ -1896,14 +2118,14 @@ "inputs": { "ema": "ema_5", "flake-compat": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema", "flake-compat" ], "flake-utils": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema", @@ -1912,7 +2134,7 @@ "heist": "heist_5", "ixset-typed": "ixset-typed_5", "nixpkgs": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema", @@ -1940,16 +2162,14 @@ "inputs": { "ema": "ema_6", "flake-compat": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", "flake-compat" ], "flake-utils": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -1958,8 +2178,7 @@ "heist": "heist_6", "ixset-typed": "ixset-typed_6", "nixpkgs": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -1989,7 +2208,6 @@ "flake-compat": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -1998,7 +2216,6 @@ "flake-utils": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -2009,7 +2226,6 @@ "nixpkgs": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -2038,6 +2254,8 @@ "ema": "ema_8", "flake-compat": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -2045,6 +2263,8 @@ ], "flake-utils": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -2054,6 +2274,8 @@ "ixset-typed": "ixset-typed_8", "nixpkgs": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema", @@ -2082,7 +2304,6 @@ "ema": "ema_9", "flake-compat": [ "plutarch-safe-money", - "plutarch-numeric", "plutarch", "emanote", "ema", @@ -2090,7 +2311,6 @@ ], "flake-utils": [ "plutarch-safe-money", - "plutarch-numeric", "plutarch", "emanote", "ema", @@ -2100,23 +2320,20 @@ "ixset-typed": "ixset-typed_9", "nixpkgs": [ "plutarch-safe-money", - "plutarch-numeric", "plutarch", "emanote", "ema", "nixpkgs" ], "pandoc-link-context": "pandoc-link-context_9", - "pathtree": "pathtree", - "tailwind-haskell": "tailwind-haskell_9", - "unionmount": "unionmount" + "tailwind-haskell": "tailwind-haskell_9" }, "locked": { - "lastModified": 1651699367, - "narHash": "sha256-f+whlGwxzv5Lcem+rxBgIgnkU+KcckogtWbRwZ6nM4I=", + "lastModified": 1653742875, + "narHash": "sha256-2IFMkA6/T0nCQHQcC8UhYWh8q8FQyGDBKfcDIhBJ3JM=", "owner": "srid", "repo": "emanote", - "rev": "2b6558fde2999ec22f645cb95322995b780f09f1", + "rev": "ab5155ef400ce83a744362a4b953315d7ee6a8c3", "type": "github" }, "original": { @@ -2257,11 +2474,11 @@ "flake-compat_17": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -2289,11 +2506,11 @@ "flake-compat_19": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -2319,6 +2536,38 @@ } }, "flake-compat_20": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_21": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_22": { "flake": false, "locked": { "lastModified": 1627913399, @@ -2730,20 +2979,37 @@ }, "flake-utils_26": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "type": "github" }, "original": { "owner": "numtide", + "ref": "v1.0.0", "repo": "flake-utils", "type": "github" } }, "flake-utils_27": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "v1.0.0", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_28": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -2758,28 +3024,13 @@ "type": "github" } }, - "flake-utils_28": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_29": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -2804,6 +3055,51 @@ } }, "flake-utils_30": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_31": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_32": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_33": { "locked": { "lastModified": 1631561581, "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", @@ -2818,7 +3114,7 @@ "type": "github" } }, - "flake-utils_31": { + "flake-utils_34": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -2882,15 +3178,16 @@ }, "flake-utils_7": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "type": "github" }, "original": { "owner": "numtide", + "ref": "v1.0.0", "repo": "flake-utils", "type": "github" } @@ -2913,16 +3210,15 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { "owner": "numtide", - "ref": "v1.0.0", "repo": "flake-utils", "type": "github" } @@ -2944,6 +3240,22 @@ } }, "flat_10": { + "flake": false, + "locked": { + "lastModified": 1651403785, + "narHash": "sha256-g+jGep1IXdw4q01W67J6f6OODY91QzIlW1+Eu8pR+u0=", + "owner": "Quid2", + "repo": "flat", + "rev": "559617e058098b776b431e2a67346ad3adea2440", + "type": "github" + }, + "original": { + "owner": "Quid2", + "repo": "flat", + "type": "github" + } + }, + "flat_11": { "flake": false, "locked": { "lastModified": 1641898475, @@ -3139,6 +3451,23 @@ "type": "github" } }, + "ghc-8.6.5-iohk_11": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, "ghc-8.6.5-iohk_2": { "flake": false, "locked": { @@ -3307,6 +3636,22 @@ "type": "github" } }, + "gitignore-nix_11": { + "flake": false, + "locked": { + "lastModified": 1611672876, + "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gitignore-nix_2": { "flake": false, "locked": { @@ -3468,6 +3813,22 @@ } }, "hackage-nix_10": { + "flake": false, + "locked": { + "lastModified": 1651108473, + "narHash": "sha256-zHGCnBdwKvrcYanjf3GARTWF8V2pyJl1QNONUNZSoc0=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "dbab3b292c3400d028a2257e3acd2ac0249da774", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage-nix_11": { "flake": false, "locked": { "lastModified": 1644369434, @@ -3612,6 +3973,22 @@ } }, "hackage_10": { + "flake": false, + "locked": { + "lastModified": 1654046237, + "narHash": "sha256-FpM9zE+Q+WrvCiaZBCg5U1g0bYpiZOCxY8V3R5ydBu8=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "eeae1790b9c6a880d96e4a7214fdf0a73bdd6fc0", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_11": { "flake": false, "locked": { "lastModified": 1644887696, @@ -3921,11 +4298,11 @@ "haskell-language-server_19": { "flake": false, "locked": { - "lastModified": 1654120290, - "narHash": "sha256-6NuFBnEzJPvWfvbYxXk/WCQDjsEbjCQ1nAelhBDi4yQ=", + "lastModified": 1653778781, + "narHash": "sha256-oEVBaYRLjD4gC3vQuT0DCgmCSIeWSwGPVXXSKJDFUK0=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "140f9040ae88352ca1140a750e7c26485fdfbe17", + "rev": "8c47d6ce2a8409a285a3f4c3f0e10c25fb4dd848", "type": "github" }, "original": { @@ -3951,22 +4328,6 @@ } }, "haskell-language-server_20": { - "flake": false, - "locked": { - "lastModified": 1653778781, - "narHash": "sha256-oEVBaYRLjD4gC3vQuT0DCgmCSIeWSwGPVXXSKJDFUK0=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "8c47d6ce2a8409a285a3f4c3f0e10c25fb4dd848", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, - "haskell-language-server_21": { "flake": false, "locked": { "lastModified": 1650980856, @@ -3983,6 +4344,22 @@ "type": "github" } }, + "haskell-language-server_21": { + "flake": false, + "locked": { + "lastModified": 1654120290, + "narHash": "sha256-6NuFBnEzJPvWfvbYxXk/WCQDjsEbjCQ1nAelhBDi4yQ=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "140f9040ae88352ca1140a750e7c26485fdfbe17", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, "haskell-language-server_22": { "flake": false, "locked": { @@ -4033,6 +4410,22 @@ } }, "haskell-language-server_25": { + "flake": false, + "locked": { + "lastModified": 1654120290, + "narHash": "sha256-6NuFBnEzJPvWfvbYxXk/WCQDjsEbjCQ1nAelhBDi4yQ=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "140f9040ae88352ca1140a750e7c26485fdfbe17", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, + "haskell-language-server_26": { "flake": false, "locked": { "lastModified": 1653778781, @@ -4048,7 +4441,7 @@ "type": "github" } }, - "haskell-language-server_26": { + "haskell-language-server_27": { "flake": false, "locked": { "lastModified": 1650980856, @@ -4065,30 +4458,14 @@ "type": "github" } }, - "haskell-language-server_27": { - "flake": false, - "locked": { - "lastModified": 1655140576, - "narHash": "sha256-mHJuIk1ElmgPxvEUO2Y3E6T674F2tO5SS/uixf4R2fM=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "8a5840a020048c74285f9997b9b02b9b04c658c6", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, "haskell-language-server_28": { "flake": false, "locked": { - "lastModified": 1645014262, - "narHash": "sha256-f49So1teiroV+S7sbGTK4AhzUOXpoiQ26/fTjdIKkqc=", + "lastModified": 1653778781, + "narHash": "sha256-oEVBaYRLjD4gC3vQuT0DCgmCSIeWSwGPVXXSKJDFUK0=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "96ea854debd92f9a54e2270b9b9a080c0ce6f3d1", + "rev": "8c47d6ce2a8409a285a3f4c3f0e10c25fb4dd848", "type": "github" }, "original": { @@ -4100,16 +4477,16 @@ "haskell-language-server_29": { "flake": false, "locked": { - "lastModified": 1643835246, - "narHash": "sha256-5LQHcQmi3mUGRgJu+X/m3jeM3kdkYjLD+KwgnxBlbeU=", + "lastModified": 1650980856, + "narHash": "sha256-uiwsfh/K3IABZDYj7JUZNIAPRVqH6g/r8X6QKg8DrZE=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "024ddc8b3904f8b8e8fe67ba6b9ebd8a4bd7ce76", + "rev": "b5a37f7fc360596899cb2945f363030f44156415", "type": "github" }, "original": { "owner": "haskell", - "ref": "1.6.1.1", + "ref": "1.7.0.0", "repo": "haskell-language-server", "type": "github" } @@ -4131,6 +4508,55 @@ "type": "github" } }, + "haskell-language-server_30": { + "flake": false, + "locked": { + "lastModified": 1655140576, + "narHash": "sha256-mHJuIk1ElmgPxvEUO2Y3E6T674F2tO5SS/uixf4R2fM=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "8a5840a020048c74285f9997b9b02b9b04c658c6", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, + "haskell-language-server_31": { + "flake": false, + "locked": { + "lastModified": 1645014262, + "narHash": "sha256-f49So1teiroV+S7sbGTK4AhzUOXpoiQ26/fTjdIKkqc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "96ea854debd92f9a54e2270b9b9a080c0ce6f3d1", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, + "haskell-language-server_32": { + "flake": false, + "locked": { + "lastModified": 1643835246, + "narHash": "sha256-5LQHcQmi3mUGRgJu+X/m3jeM3kdkYjLD+KwgnxBlbeU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "024ddc8b3904f8b8e8fe67ba6b9ebd8a4bd7ce76", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "1.6.1.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "haskell-language-server_4": { "flake": false, "locked": { @@ -4181,6 +4607,22 @@ } }, "haskell-language-server_7": { + "flake": false, + "locked": { + "lastModified": 1654120290, + "narHash": "sha256-6NuFBnEzJPvWfvbYxXk/WCQDjsEbjCQ1nAelhBDi4yQ=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "140f9040ae88352ca1140a750e7c26485fdfbe17", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, + "haskell-language-server_8": { "flake": false, "locked": { "lastModified": 1653778781, @@ -4196,7 +4638,7 @@ "type": "github" } }, - "haskell-language-server_8": { + "haskell-language-server_9": { "flake": false, "locked": { "lastModified": 1650980856, @@ -4213,22 +4655,6 @@ "type": "github" } }, - "haskell-language-server_9": { - "flake": false, - "locked": { - "lastModified": 1654120290, - "narHash": "sha256-6NuFBnEzJPvWfvbYxXk/WCQDjsEbjCQ1nAelhBDi4yQ=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "140f9040ae88352ca1140a750e7c26485fdfbe17", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, "haskell-nix": { "inputs": { "HTTP": "HTTP", @@ -4296,17 +4722,44 @@ "type": "github" } }, + "haskell-nix-extra-hackage_10": { + "inputs": { + "haskell-nix": [ + "plutarch-safe-money", + "plutarch", + "haskell-nix" + ], + "nixpkgs": [ + "plutarch-safe-money", + "plutarch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1653405678, + "narHash": "sha256-fPpPxuCZDF5b/iQgmUg2jspPObsK0mpcchUti/LR8D0=", + "owner": "mlabs-haskell", + "repo": "haskell-nix-extra-hackage", + "rev": "cf4613eb0d883a8c12c86d7cdbdaaf15fdc70128", + "type": "github" + }, + "original": { + "owner": "mlabs-haskell", + "repo": "haskell-nix-extra-hackage", + "type": "github" + } + }, "haskell-nix-extra-hackage_2": { "inputs": { "haskell-nix": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix" ], "nixpkgs": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "nixpkgs" ] @@ -4328,10 +4781,14 @@ "haskell-nix-extra-hackage_3": { "inputs": { "haskell-nix": [ + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix" ], "nixpkgs": [ + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "nixpkgs" ] @@ -4353,12 +4810,10 @@ "haskell-nix-extra-hackage_4": { "inputs": { "haskell-nix": [ - "plutarch-context-builder", "plutarch", "haskell-nix" ], "nixpkgs": [ - "plutarch-context-builder", "plutarch", "nixpkgs" ] @@ -4380,12 +4835,12 @@ "haskell-nix-extra-hackage_5": { "inputs": { "haskell-nix": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "haskell-nix" ], "nixpkgs": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "nixpkgs" ] @@ -4407,12 +4862,12 @@ "haskell-nix-extra-hackage_6": { "inputs": { "haskell-nix": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix" ], "nixpkgs": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "nixpkgs" ] @@ -4434,14 +4889,12 @@ "haskell-nix-extra-hackage_7": { "inputs": { "haskell-nix": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix" ], "nixpkgs": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "nixpkgs" ] @@ -4465,14 +4918,12 @@ "haskell-nix": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "haskell-nix" ], "nixpkgs": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "nixpkgs" ] @@ -4495,11 +4946,15 @@ "inputs": { "haskell-nix": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix" ], "nixpkgs": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "nixpkgs" ] @@ -4548,7 +5003,7 @@ "hydra": "hydra_6", "nix-tools": "nix-tools_6", "nixpkgs": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4604,8 +5059,7 @@ "hydra": "hydra_7", "nix-tools": "nix-tools_7", "nixpkgs": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4663,7 +5117,6 @@ "nixpkgs": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4720,6 +5173,8 @@ "nix-tools": "nix-tools_9", "nixpkgs": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4768,14 +5223,14 @@ "cabal-34": "cabal-34_10", "cabal-36": "cabal-36_10", "cardano-shell": "cardano-shell_10", - "flake-utils": "flake-utils_31", + "flake-utils": "flake-utils_28", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_10", "hackage": "hackage_10", "hpc-coveralls": "hpc-coveralls_10", + "hydra": "hydra_10", "nix-tools": "nix-tools_10", "nixpkgs": [ "plutarch-safe-money", - "plutarch-numeric", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4788,16 +5243,15 @@ "stackage": "stackage_10" }, "locked": { - "lastModified": 1644944726, - "narHash": "sha256-jJWdP/3Ne1y1akC3m9rSO5ItRoBc4UTdVQZBCuPmmrM=", - "owner": "L-as", + "lastModified": 1654068838, + "narHash": "sha256-GHSufC21DSg8Lz2AzIg3DA9DPxGvLqxGFa/4ADoXRhU=", + "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "45c583b5580c130487eb5a342679f0bdbc2b23fc", + "rev": "fa2fa131fe15e630c91ab4078d12eb32c41f934b", "type": "github" }, "original": { - "owner": "L-as", - "ref": "master", + "owner": "input-output-hk", "repo": "haskell.nix", "type": "github" } @@ -4819,6 +5273,63 @@ } }, "haskell-nix_20": { + "flake": false, + "locked": { + "lastModified": 1651151636, + "narHash": "sha256-WdMP9IMB5kByT0zimDuCYZF/dinRB104H8iDTG/c1Eo=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "f707aa2e75c0d33473166abc61c0b43ac6e107c0", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskell-nix_21": { + "inputs": { + "HTTP": "HTTP_11", + "cabal-32": "cabal-32_11", + "cabal-34": "cabal-34_11", + "cabal-36": "cabal-36_11", + "cardano-shell": "cardano-shell_11", + "flake-utils": "flake-utils_34", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_11", + "hackage": "hackage_11", + "hpc-coveralls": "hpc-coveralls_11", + "nix-tools": "nix-tools_11", + "nixpkgs": [ + "plutarch-safe-money", + "plutarch-numeric", + "plutarch", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_11", + "nixpkgs-2105": "nixpkgs-2105_11", + "nixpkgs-2111": "nixpkgs-2111_22", + "nixpkgs-unstable": "nixpkgs-unstable_11", + "old-ghc-nix": "old-ghc-nix_11", + "stackage": "stackage_11" + }, + "locked": { + "lastModified": 1644944726, + "narHash": "sha256-jJWdP/3Ne1y1akC3m9rSO5ItRoBc4UTdVQZBCuPmmrM=", + "owner": "L-as", + "repo": "haskell.nix", + "rev": "45c583b5580c130487eb5a342679f0bdbc2b23fc", + "type": "github" + }, + "original": { + "owner": "L-as", + "ref": "master", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskell-nix_22": { "flake": false, "locked": { "lastModified": 1629380841, @@ -4849,7 +5360,7 @@ "nix-tools": "nix-tools_2", "nixpkgs": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4898,13 +5409,15 @@ "cabal-34": "cabal-34_3", "cabal-36": "cabal-36_3", "cardano-shell": "cardano-shell_3", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_9", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", "hackage": "hackage_3", "hpc-coveralls": "hpc-coveralls_3", "hydra": "hydra_3", "nix-tools": "nix-tools_3", "nixpkgs": [ + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -4960,7 +5473,6 @@ "hydra": "hydra_4", "nix-tools": "nix-tools_4", "nixpkgs": [ - "plutarch-context-builder", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -5016,7 +5528,7 @@ "hydra": "hydra_5", "nix-tools": "nix-tools_5", "nixpkgs": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -5059,6 +5571,23 @@ "type": "github" } }, + "heist_10": { + "flake": false, + "locked": { + "lastModified": 1649279862, + "narHash": "sha256-YPD7Qv1ZcXM4uAlsZ2P/2CKen4H2OY3VHHGluYFVulg=", + "owner": "srid", + "repo": "heist", + "rev": "085c7ab88b73079de27c8def27d67f03853fde05", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "emanote-release--ghc9", + "repo": "heist", + "type": "github" + } + }, "heist_2": { "flake": false, "locked": { @@ -5181,16 +5710,16 @@ "heist_9": { "flake": false, "locked": { - "lastModified": 1649279862, - "narHash": "sha256-YPD7Qv1ZcXM4uAlsZ2P/2CKen4H2OY3VHHGluYFVulg=", + "lastModified": 1653169917, + "narHash": "sha256-i52wi4nNC6ATx8gTtmpLnxQZEhKSM0LbpmSu57d5VqI=", "owner": "srid", "repo": "heist", - "rev": "085c7ab88b73079de27c8def27d67f03853fde05", + "rev": "75533cade1a0d9859ff487cbf6f22e98711248d3", "type": "github" }, "original": { "owner": "srid", - "ref": "emanote-release--ghc9", + "ref": "emanote", "repo": "heist", "type": "github" } @@ -5215,7 +5744,25 @@ }, "hercules-ci-effects_10": { "inputs": { - "nixpkgs": "nixpkgs_48" + "nixpkgs": "nixpkgs_47" + }, + "locked": { + "lastModified": 1653841712, + "narHash": "sha256-XBF4i1MuIRAEbFpj3Z3fVaYxzNEsYapyENtw3vG+q1I=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "e14d2131b7c81acca3904b584ac45fb72da64dd2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, + "hercules-ci-effects_11": { + "inputs": { + "nixpkgs": "nixpkgs_53" }, "locked": { "lastModified": 1647711660, @@ -5251,7 +5798,7 @@ }, "hercules-ci-effects_3": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1653841712, @@ -5407,6 +5954,22 @@ "type": "github" } }, + "hpc-coveralls_11": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, "hpc-coveralls_2": { "flake": false, "locked": { @@ -5626,12 +6189,37 @@ "type": "indirect" } }, + "hydra_10": { + "inputs": { + "nix": "nix_10", + "nixpkgs": [ + "plutarch-safe-money", + "plutarch", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", + "owner": "NixOS", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, "hydra_2": { "inputs": { "nix": "nix_2", "nixpkgs": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix", "hydra", @@ -5656,6 +6244,8 @@ "inputs": { "nix": "nix_3", "nixpkgs": [ + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "hydra", @@ -5680,7 +6270,6 @@ "inputs": { "nix": "nix_4", "nixpkgs": [ - "plutarch-context-builder", "plutarch", "haskell-nix", "hydra", @@ -5705,7 +6294,7 @@ "inputs": { "nix": "nix_5", "nixpkgs": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "haskell-nix", "hydra", @@ -5730,7 +6319,7 @@ "inputs": { "nix": "nix_6", "nixpkgs": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix", "hydra", @@ -5755,8 +6344,7 @@ "inputs": { "nix": "nix_7", "nixpkgs": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "hydra", @@ -5783,7 +6371,6 @@ "nixpkgs": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "haskell-nix", "hydra", @@ -5809,6 +6396,8 @@ "nix": "nix_9", "nixpkgs": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "hydra", @@ -5992,11 +6581,11 @@ "iohk-nix_19": { "flake": false, "locked": { - "lastModified": 1643251385, - "narHash": "sha256-Czbd69lg0ARSZfC18V6h+gtPMioWDAEVPbiHgL2x9LM=", + "lastModified": 1653579289, + "narHash": "sha256-wveDdPsgB/3nAGAdFaxrcgLEpdi0aJ5kEVNtI+YqVfo=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "9d6ee3dcb3482f791e40ed991ad6fc649b343ad4", + "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", "type": "github" }, "original": { @@ -6037,6 +6626,38 @@ "type": "github" } }, + "iohk-nix_21": { + "flake": false, + "locked": { + "lastModified": 1643251385, + "narHash": "sha256-Czbd69lg0ARSZfC18V6h+gtPMioWDAEVPbiHgL2x9LM=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "9d6ee3dcb3482f791e40ed991ad6fc649b343ad4", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohk-nix_22": { + "flake": false, + "locked": { + "lastModified": 1626953580, + "narHash": "sha256-iEI9aTOaZMGsjWzcrctrC0usmiagwKT2v1LSDe9/tMU=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "cbd497f5844249ef8fe617166337d59f2a6ebe90", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, "iohk-nix_3": { "flake": false, "locked": { @@ -6165,6 +6786,22 @@ "type": "github" } }, + "ixset-typed_10": { + "flake": false, + "locked": { + "lastModified": 1639657838, + "narHash": "sha256-pI2dzJfkR10CHDEX6TV2E01pqcGkj7kheROw05MRTR8=", + "owner": "well-typed", + "repo": "ixset-typed", + "rev": "6cf16f77ae173311742623e5f0b308a21b337aa7", + "type": "github" + }, + "original": { + "owner": "well-typed", + "repo": "ixset-typed", + "type": "github" + } + }, "ixset-typed_2": { "flake": false, "locked": { @@ -6280,11 +6917,11 @@ "ixset-typed_9": { "flake": false, "locked": { - "lastModified": 1639657838, - "narHash": "sha256-pI2dzJfkR10CHDEX6TV2E01pqcGkj7kheROw05MRTR8=", + "lastModified": 1652177108, + "narHash": "sha256-g0N1jiumsxHzfo9SGVR+q9awRvHEehSRaoW89LXCCnY=", "owner": "well-typed", "repo": "ixset-typed", - "rev": "6cf16f77ae173311742623e5f0b308a21b337aa7", + "rev": "244d3b72fd051b8d78f2d4edb6208269f29d85b7", "type": "github" }, "original": { @@ -6295,7 +6932,7 @@ }, "lint-utils": { "inputs": { - "flake-utils": "flake-utils_27", + "flake-utils": "flake-utils_30", "nixpkgs": [ "plutarch-safe-money", "plutarch-numeric", @@ -6336,26 +6973,27 @@ "nixpkgs-2111": "nixpkgs-2111", "nixpkgs-latest": "nixpkgs-latest", "plutarch": "plutarch", + "plutarch-numeric": "plutarch-numeric", "plutarch-quickcheck": "plutarch-quickcheck" }, "locked": { - "lastModified": 1655824848, - "narHash": "sha256-ZpQ/d+wIO18uE+h6cysPHNpog1f7Qlfy6ul1FSnm2Ek=", + "lastModified": 1656396683, + "narHash": "sha256-Elk16j7kZcO9U9phqrY915rTEqkPchDZ9QydH+VmiC8=", "owner": "Liqwid-Labs", "repo": "liqwid-plutarch-extra", - "rev": "620072d639afd91c84e7347b35df4dfe247546a4", + "rev": "6bcd6068593b00adc4a1afd59b127398ea37d770", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "main", "repo": "liqwid-plutarch-extra", + "rev": "6bcd6068593b00adc4a1afd59b127398ea37d770", "type": "github" } }, "liqwid-plutarch-extra_2": { "inputs": { - "haskell-language-server": "haskell-language-server_19", + "haskell-language-server": "haskell-language-server_22", "haskell-nix": [ "plutarch-safe-money", "liqwid-plutarch-extra", @@ -6368,9 +7006,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_13", - "nixpkgs-latest": "nixpkgs-latest_13", - "plutarch": "plutarch_7", + "nixpkgs-2111": "nixpkgs-2111_15", + "nixpkgs-latest": "nixpkgs-latest_15", + "plutarch": "plutarch_8", "plutarch-quickcheck": "plutarch-quickcheck_3" }, "locked": { @@ -6404,6 +7042,22 @@ "type": "github" } }, + "lowdown-src_10": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "lowdown-src_2": { "flake": false, "locked": { @@ -6570,6 +7224,22 @@ } }, "nix-tools_10": { + "flake": false, + "locked": { + "lastModified": 1649424170, + "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-tools", + "type": "github" + } + }, + "nix-tools_11": { "flake": false, "locked": { "lastModified": 1644395812, @@ -6713,6 +7383,27 @@ "type": "github" } }, + "nix_10": { + "inputs": { + "lowdown-src": "lowdown-src_10", + "nixpkgs": "nixpkgs_46", + "nixpkgs-regression": "nixpkgs-regression_10" + }, + "locked": { + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "owner": "NixOS", + "repo": "nix", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.6.0", + "repo": "nix", + "type": "github" + } + }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", @@ -6737,7 +7428,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_13", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -6929,6 +7620,22 @@ "type": "github" } }, + "nixpkgs-2003_11": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2003_2": { "locked": { "lastModified": 1620055814, @@ -7074,6 +7781,22 @@ } }, "nixpkgs-2105_10": { + "locked": { + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_11": { "locked": { "lastModified": 1642244250, "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", @@ -7251,11 +7974,11 @@ }, "nixpkgs-2111_11": { "locked": { - "lastModified": 1652364845, - "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", + "lastModified": 1653319070, + "narHash": "sha256-Z3cv967iN6mXgxhq1cjOoPod23XgNttCWHXMnMZUq9E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", + "rev": "1c813bbdc330b45fe922c642eb610902aecd5673", "type": "github" }, "original": { @@ -7283,11 +8006,11 @@ }, "nixpkgs-2111_13": { "locked": { - "lastModified": 1654115789, - "narHash": "sha256-k9Qr8dLrmgEn+xIVbneJdQgCYG8FbbqOrTVaExUrLFI=", + "lastModified": 1652364845, + "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bce6d15455f8c15c9ef511368947e7ef789c5316", + "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", "type": "github" }, "original": { @@ -7315,11 +8038,11 @@ }, "nixpkgs-2111_15": { "locked": { - "lastModified": 1652364845, - "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", + "lastModified": 1654115789, + "narHash": "sha256-k9Qr8dLrmgEn+xIVbneJdQgCYG8FbbqOrTVaExUrLFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", + "rev": "bce6d15455f8c15c9ef511368947e7ef789c5316", "type": "github" }, "original": { @@ -7347,11 +8070,11 @@ }, "nixpkgs-2111_17": { "locked": { - "lastModified": 1653319070, - "narHash": "sha256-Z3cv967iN6mXgxhq1cjOoPod23XgNttCWHXMnMZUq9E=", + "lastModified": 1652364845, + "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c813bbdc330b45fe922c642eb610902aecd5673", + "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", "type": "github" }, "original": { @@ -7410,6 +8133,38 @@ } }, "nixpkgs-2111_20": { + "locked": { + "lastModified": 1648744337, + "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_21": { + "locked": { + "lastModified": 1653319070, + "narHash": "sha256-Z3cv967iN6mXgxhq1cjOoPod23XgNttCWHXMnMZUq9E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1c813bbdc330b45fe922c642eb610902aecd5673", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_22": { "locked": { "lastModified": 1644510859, "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=", @@ -7427,11 +8182,11 @@ }, "nixpkgs-2111_3": { "locked": { - "lastModified": 1652364845, - "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", + "lastModified": 1653319070, + "narHash": "sha256-Z3cv967iN6mXgxhq1cjOoPod23XgNttCWHXMnMZUq9E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", + "rev": "1c813bbdc330b45fe922c642eb610902aecd5673", "type": "github" }, "original": { @@ -7459,11 +8214,11 @@ }, "nixpkgs-2111_5": { "locked": { - "lastModified": 1655415671, - "narHash": "sha256-WD7HxxW1m8D/fkV1QlCYlZvnE5gQdg7ckq3myI4gPtE=", + "lastModified": 1652364845, + "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f96729212602f15a6a226d2f27f5de70492ad095", + "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", "type": "github" }, "original": { @@ -7491,11 +8246,11 @@ }, "nixpkgs-2111_7": { "locked": { - "lastModified": 1652298859, - "narHash": "sha256-hcwRboK+NxMWUJh0fQ3VsocDcAHrYJ95FmPEHlddV0Y=", + "lastModified": 1655415671, + "narHash": "sha256-WD7HxxW1m8D/fkV1QlCYlZvnE5gQdg7ckq3myI4gPtE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051448e41537c3463ae776d46115d01afb6c498d", + "rev": "f96729212602f15a6a226d2f27f5de70492ad095", "type": "github" }, "original": { @@ -7523,11 +8278,11 @@ }, "nixpkgs-2111_9": { "locked": { - "lastModified": 1653319070, - "narHash": "sha256-Z3cv967iN6mXgxhq1cjOoPod23XgNttCWHXMnMZUq9E=", + "lastModified": 1652298859, + "narHash": "sha256-hcwRboK+NxMWUJh0fQ3VsocDcAHrYJ95FmPEHlddV0Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c813bbdc330b45fe922c642eb610902aecd5673", + "rev": "051448e41537c3463ae776d46115d01afb6c498d", "type": "github" }, "original": { @@ -7729,6 +8484,38 @@ "type": "github" } }, + "nixpkgs-latest_20": { + "locked": { + "lastModified": 1653918805, + "narHash": "sha256-6ahwAnBNGgqSNSn/6RnsxrlFi+fkA+RyT6o/5S1915o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0a69be4b5ee63f1b5e75887a406e9194012b492", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0a69be4b5ee63f1b5e75887a406e9194012b492", + "type": "github" + } + }, + "nixpkgs-latest_21": { + "locked": { + "lastModified": 1653918805, + "narHash": "sha256-6ahwAnBNGgqSNSn/6RnsxrlFi+fkA+RyT6o/5S1915o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0a69be4b5ee63f1b5e75887a406e9194012b492", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0a69be4b5ee63f1b5e75887a406e9194012b492", + "type": "github" + } + }, "nixpkgs-latest_3": { "locked": { "lastModified": 1653918805, @@ -7856,6 +8643,21 @@ "type": "indirect" } }, + "nixpkgs-regression_10": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, "nixpkgs-regression_2": { "locked": { "lastModified": 1643052045, @@ -7993,6 +8795,22 @@ } }, "nixpkgs-unstable_10": { + "locked": { + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_11": { "locked": { "lastModified": 1644486793, "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", @@ -8154,6 +8972,36 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1652885393, + "narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "48037fd90426e44e4bf03e6479e88a11453b9b66", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1653117584, + "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -8168,7 +9016,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1647297614, "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", @@ -8184,7 +9032,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_15": { "flake": false, "locked": { "lastModified": 1645493675, @@ -8201,36 +9049,6 @@ "type": "github" } }, - "nixpkgs_14": { - "locked": { - "lastModified": 1652885393, - "narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "48037fd90426e44e4bf03e6479e88a11453b9b66", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1653117584, - "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_16": { "locked": { "lastModified": 1632864508, @@ -8716,59 +9534,27 @@ }, "nixpkgs_44": { "locked": { - "lastModified": 1650882267, - "narHash": "sha256-BFKiz8srATQIBuFEN2HgS2EHisK29EjZ/HV34wSr2lU=", + "lastModified": 1652885393, + "narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", + "rev": "48037fd90426e44e4bf03e6479e88a11453b9b66", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", "type": "github" } }, "nixpkgs_45": { "locked": { - "lastModified": 1647350163, - "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", - "type": "github" - } - }, - "nixpkgs_46": { - "locked": { - "lastModified": 1649456639, - "narHash": "sha256-rZCjaEAZgOtT9kYTBigksof64SqKAXOuoHhlzHvfl0E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c48167590e3258daac6ab12a41bc2b7341e9b2ec", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c48167590e3258daac6ab12a41bc2b7341e9b2ec", - "type": "github" - } - }, - "nixpkgs_47": { - "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1653117584, + "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", "type": "github" }, "original": { @@ -8776,7 +9562,22 @@ "type": "indirect" } }, - "nixpkgs_48": { + "nixpkgs_46": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_47": { "locked": { "lastModified": 1647297614, "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", @@ -8792,14 +9593,14 @@ "type": "github" } }, - "nixpkgs_49": { + "nixpkgs_48": { "flake": false, "locked": { - "lastModified": 1628785280, - "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=", + "lastModified": 1645493675, + "narHash": "sha256-9xundbZQbhFodsQRh6QMN1GeSXfo3y/5NL0CZcJULz0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb", + "rev": "74b10859829153d5c5d50f7c77b86763759e8654", "type": "github" }, "original": { @@ -8809,6 +9610,22 @@ "type": "github" } }, + "nixpkgs_49": { + "locked": { + "lastModified": 1650882267, + "narHash": "sha256-BFKiz8srATQIBuFEN2HgS2EHisK29EjZ/HV34wSr2lU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", + "type": "github" + } + }, "nixpkgs_5": { "flake": false, "locked": { @@ -8826,6 +9643,85 @@ "type": "github" } }, + "nixpkgs_50": { + "locked": { + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "type": "github" + } + }, + "nixpkgs_51": { + "locked": { + "lastModified": 1649456639, + "narHash": "sha256-rZCjaEAZgOtT9kYTBigksof64SqKAXOuoHhlzHvfl0E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c48167590e3258daac6ab12a41bc2b7341e9b2ec", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c48167590e3258daac6ab12a41bc2b7341e9b2ec", + "type": "github" + } + }, + "nixpkgs_52": { + "locked": { + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_53": { + "locked": { + "lastModified": 1647297614, + "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_54": { + "flake": false, + "locked": { + "lastModified": 1628785280, + "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { "locked": { "lastModified": 1652885393, @@ -8921,6 +9817,23 @@ "type": "github" } }, + "old-ghc-nix_11": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, "old-ghc-nix_2": { "flake": false, "locked": { @@ -9074,6 +9987,23 @@ "type": "github" } }, + "pandoc-link-context_10": { + "flake": false, + "locked": { + "lastModified": 1650932770, + "narHash": "sha256-/WzE4O23B1OcL3WF8Saz5TRQj0tGH7FtbgRLRson2Mc=", + "owner": "srid", + "repo": "pandoc-link-context", + "rev": "85bd204339aafd309b8a3dd99ebffa6a50776cb6", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "master", + "repo": "pandoc-link-context", + "type": "github" + } + }, "pandoc-link-context_2": { "flake": false, "locked": { @@ -9196,11 +10126,11 @@ "pandoc-link-context_9": { "flake": false, "locked": { - "lastModified": 1650932770, - "narHash": "sha256-/WzE4O23B1OcL3WF8Saz5TRQj0tGH7FtbgRLRson2Mc=", + "lastModified": 1653170888, + "narHash": "sha256-bA/Oj2pt3H2b4lqWqVBYo3Qhvhd01r4vM39+vLuPMtA=", "owner": "srid", "repo": "pandoc-link-context", - "rev": "85bd204339aafd309b8a3dd99ebffa6a50776cb6", + "rev": "c3a3de34b291b2bfec04387af65e0cc0822373c5", "type": "github" }, "original": { @@ -9212,9 +10142,9 @@ }, "pathtree": { "inputs": { - "flake-compat": "flake-compat_18", - "flake-utils": "flake-utils_28", - "nixpkgs": "nixpkgs_45" + "flake-compat": "flake-compat_20", + "flake-utils": "flake-utils_31", + "nixpkgs": "nixpkgs_50" }, "locked": { "lastModified": 1649011952, @@ -9270,7 +10200,7 @@ }, "plutarch-context-builder": { "inputs": { - "haskell-language-server": "haskell-language-server_9", + "haskell-language-server": "haskell-language-server_12", "haskell-nix": [ "plutarch-context-builder", "plutarch", @@ -9281,9 +10211,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_7", - "nixpkgs-latest": "nixpkgs-latest_7", - "plutarch": "plutarch_4" + "nixpkgs-2111": "nixpkgs-2111_9", + "nixpkgs-latest": "nixpkgs-latest_9", + "plutarch": "plutarch_5" }, "locked": { "lastModified": 1655751255, @@ -9302,7 +10232,40 @@ }, "plutarch-numeric": { "inputs": { - "haskell-language-server": "haskell-language-server_12", + "haskell-language-server": "haskell-language-server_4", + "haskell-nix": [ + "liqwid-plutarch-extra", + "plutarch-numeric", + "plutarch", + "haskell-nix" + ], + "nixpkgs": [ + "liqwid-plutarch-extra", + "plutarch-numeric", + "plutarch", + "nixpkgs" + ], + "nixpkgs-2111": "nixpkgs-2111_3", + "nixpkgs-latest": "nixpkgs-latest_3", + "plutarch": "plutarch_2" + }, + "locked": { + "lastModified": 1655733533, + "narHash": "sha256-HRSJUEQYYwr0HvYn6GwLmyYY7TXwZcYPAW0U8t6nmok=", + "owner": "liqwid-labs", + "repo": "plutarch-numeric", + "rev": "ce2d39dc366d9453b0f5df328bbb78f11e3b2ed6", + "type": "github" + }, + "original": { + "owner": "liqwid-labs", + "repo": "plutarch-numeric", + "type": "github" + } + }, + "plutarch-numeric_2": { + "inputs": { + "haskell-language-server": "haskell-language-server_15", "haskell-nix": [ "plutarch-numeric", "plutarch", @@ -9313,9 +10276,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_9", - "nixpkgs-latest": "nixpkgs-latest_9", - "plutarch": "plutarch_5" + "nixpkgs-2111": "nixpkgs-2111_11", + "nixpkgs-latest": "nixpkgs-latest_11", + "plutarch": "plutarch_6" }, "locked": { "lastModified": 1655733533, @@ -9332,9 +10295,9 @@ "type": "github" } }, - "plutarch-numeric_2": { + "plutarch-numeric_3": { "inputs": { - "haskell-language-server": "haskell-language-server_27", + "haskell-language-server": "haskell-language-server_30", "haskell-nix": [ "plutarch-safe-money", "plutarch-numeric", @@ -9347,9 +10310,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_19", - "nixpkgs-latest": "nixpkgs-latest_19", - "plutarch": "plutarch_10" + "nixpkgs-2111": "nixpkgs-2111_21", + "nixpkgs-latest": "nixpkgs-latest_21", + "plutarch": "plutarch_11" }, "locked": { "lastModified": 1654950823, @@ -9368,7 +10331,7 @@ }, "plutarch-quickcheck": { "inputs": { - "haskell-language-server": "haskell-language-server_4", + "haskell-language-server": "haskell-language-server_7", "haskell-nix": [ "liqwid-plutarch-extra", "plutarch-quickcheck", @@ -9381,9 +10344,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_3", - "nixpkgs-latest": "nixpkgs-latest_3", - "plutarch": "plutarch_2" + "nixpkgs-2111": "nixpkgs-2111_5", + "nixpkgs-latest": "nixpkgs-latest_5", + "plutarch": "plutarch_3" }, "locked": { "lastModified": 1655113586, @@ -9402,7 +10365,7 @@ }, "plutarch-quickcheck_2": { "inputs": { - "haskell-language-server": "haskell-language-server_15", + "haskell-language-server": "haskell-language-server_18", "haskell-nix": [ "plutarch-quickcheck", "plutarch", @@ -9413,9 +10376,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_11", - "nixpkgs-latest": "nixpkgs-latest_11", - "plutarch": "plutarch_6" + "nixpkgs-2111": "nixpkgs-2111_13", + "nixpkgs-latest": "nixpkgs-latest_13", + "plutarch": "plutarch_7" }, "locked": { "lastModified": 1655307888, @@ -9434,7 +10397,7 @@ }, "plutarch-quickcheck_3": { "inputs": { - "haskell-language-server": "haskell-language-server_22", + "haskell-language-server": "haskell-language-server_25", "haskell-nix": [ "plutarch-safe-money", "liqwid-plutarch-extra", @@ -9449,9 +10412,9 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_15", - "nixpkgs-latest": "nixpkgs-latest_15", - "plutarch": "plutarch_8" + "nixpkgs-2111": "nixpkgs-2111_17", + "nixpkgs-latest": "nixpkgs-latest_17", + "plutarch": "plutarch_9" }, "locked": { "lastModified": 1655113586, @@ -9470,7 +10433,7 @@ }, "plutarch-safe-money": { "inputs": { - "haskell-language-server": "haskell-language-server_18", + "haskell-language-server": "haskell-language-server_21", "haskell-nix": [ "plutarch-safe-money", "plutarch", @@ -9482,10 +10445,10 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_17", - "nixpkgs-latest": "nixpkgs-latest_17", - "plutarch": "plutarch_9", - "plutarch-numeric": "plutarch-numeric_2" + "nixpkgs-2111": "nixpkgs-2111_19", + "nixpkgs-latest": "nixpkgs-latest_19", + "plutarch": "plutarch_10", + "plutarch-numeric": "plutarch-numeric_3" }, "locked": { "lastModified": 1655471113, @@ -9504,22 +10467,60 @@ }, "plutarch_10": { "inputs": { - "Shrinker": "Shrinker", "cardano-base": "cardano-base_10", "cardano-crypto": "cardano-crypto_10", "cardano-prelude": "cardano-prelude_10", - "cryptonite": "cryptonite", "emanote": "emanote_9", "flat": "flat_10", - "foundation": "foundation", "haskell-language-server": "haskell-language-server_28", "haskell-nix": "haskell-nix_19", + "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_10", "hercules-ci-effects": "hercules-ci-effects_10", + "iohk-nix": "iohk-nix_19", + "nixpkgs": [ + "plutarch-safe-money", + "plutarch", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-latest": "nixpkgs-latest_20", + "plutus": "plutus_10", + "protolude": "protolude_10", + "secp256k1-haskell": "secp256k1-haskell_10" + }, + "locked": { + "lastModified": 1654108284, + "narHash": "sha256-VD0zX4pFrJJaaUO7uJgioZGg1moe1Fy8nAb5j2mV/Qc=", + "owner": "Liqwid-Labs", + "repo": "plutarch", + "rev": "e7ef565645146e26e75ec29fe97122a74e52c6b7", + "type": "github" + }, + "original": { + "owner": "Liqwid-Labs", + "ref": "staging", + "repo": "plutarch", + "type": "github" + } + }, + "plutarch_11": { + "inputs": { + "Shrinker": "Shrinker", + "cardano-base": "cardano-base_11", + "cardano-crypto": "cardano-crypto_11", + "cardano-prelude": "cardano-prelude_11", + "cryptonite": "cryptonite", + "emanote": "emanote_10", + "flat": "flat_11", + "foundation": "foundation", + "haskell-language-server": "haskell-language-server_31", + "haskell-nix": "haskell-nix_21", + "hercules-ci-effects": "hercules-ci-effects_11", "hs-memory": "hs-memory", "hspec": "hspec", "hspec-golden": "hspec-golden", "hspec-hedgehog": "hspec-hedgehog", - "iohk-nix": "iohk-nix_19", + "iohk-nix": "iohk-nix_21", "nixpkgs": [ "plutarch-safe-money", "plutarch-numeric", @@ -9527,8 +10528,8 @@ "haskell-nix", "nixpkgs-unstable" ], - "plutus": "plutus_10", - "protolude": "protolude_10", + "plutus": "plutus_11", + "protolude": "protolude_11", "sized-functors": "sized-functors", "th-extras": "th-extras" }, @@ -9561,7 +10562,7 @@ "iohk-nix": "iohk-nix_3", "nixpkgs": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9591,18 +10592,16 @@ "cardano-base": "cardano-base_3", "cardano-crypto": "cardano-crypto_3", "cardano-prelude": "cardano-prelude_3", - "emanote": [ - "plutarch", - "haskell-nix", - "nixpkgs-unstable" - ], + "emanote": "emanote_3", "flat": "flat_3", - "haskell-language-server": "haskell-language-server_7", + "haskell-language-server": "haskell-language-server_8", "haskell-nix": "haskell-nix_5", "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_3", "hercules-ci-effects": "hercules-ci-effects_3", "iohk-nix": "iohk-nix_5", "nixpkgs": [ + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9612,44 +10611,6 @@ "protolude": "protolude_3", "secp256k1-haskell": "secp256k1-haskell_3" }, - "locked": { - "lastModified": 1654108284, - "narHash": "sha256-VD0zX4pFrJJaaUO7uJgioZGg1moe1Fy8nAb5j2mV/Qc=", - "owner": "liqwid-labs", - "repo": "plutarch", - "rev": "e7ef565645146e26e75ec29fe97122a74e52c6b7", - "type": "github" - }, - "original": { - "owner": "liqwid-labs", - "repo": "plutarch", - "rev": "e7ef565645146e26e75ec29fe97122a74e52c6b7", - "type": "github" - } - }, - "plutarch_4": { - "inputs": { - "cardano-base": "cardano-base_4", - "cardano-crypto": "cardano-crypto_4", - "cardano-prelude": "cardano-prelude_4", - "emanote": "emanote_3", - "flat": "flat_4", - "haskell-language-server": "haskell-language-server_10", - "haskell-nix": "haskell-nix_7", - "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_4", - "hercules-ci-effects": "hercules-ci-effects_4", - "iohk-nix": "iohk-nix_7", - "nixpkgs": [ - "plutarch-context-builder", - "plutarch", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-latest": "nixpkgs-latest_8", - "plutus": "plutus_4", - "protolude": "protolude_4", - "secp256k1-haskell": "secp256k1-haskell_4" - }, "locked": { "lastModified": 1654108284, "narHash": "sha256-VD0zX4pFrJJaaUO7uJgioZGg1moe1Fy8nAb5j2mV/Qc=", @@ -9665,6 +10626,47 @@ "type": "github" } }, + "plutarch_4": { + "inputs": { + "cardano-base": "cardano-base_4", + "cardano-crypto": "cardano-crypto_4", + "cardano-prelude": "cardano-prelude_4", + "emanote": [ + "plutarch", + "haskell-nix", + "nixpkgs-unstable" + ], + "flat": "flat_4", + "haskell-language-server": "haskell-language-server_10", + "haskell-nix": "haskell-nix_7", + "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_4", + "hercules-ci-effects": "hercules-ci-effects_4", + "iohk-nix": "iohk-nix_7", + "nixpkgs": [ + "plutarch", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-latest": "nixpkgs-latest_8", + "plutus": "plutus_4", + "protolude": "protolude_4", + "secp256k1-haskell": "secp256k1-haskell_4" + }, + "locked": { + "lastModified": 1654108284, + "narHash": "sha256-VD0zX4pFrJJaaUO7uJgioZGg1moe1Fy8nAb5j2mV/Qc=", + "owner": "liqwid-labs", + "repo": "plutarch", + "rev": "e7ef565645146e26e75ec29fe97122a74e52c6b7", + "type": "github" + }, + "original": { + "owner": "liqwid-labs", + "repo": "plutarch", + "rev": "e7ef565645146e26e75ec29fe97122a74e52c6b7", + "type": "github" + } + }, "plutarch_5": { "inputs": { "cardano-base": "cardano-base_5", @@ -9678,7 +10680,7 @@ "hercules-ci-effects": "hercules-ci-effects_5", "iohk-nix": "iohk-nix_9", "nixpkgs": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9716,7 +10718,7 @@ "hercules-ci-effects": "hercules-ci-effects_6", "iohk-nix": "iohk-nix_11", "nixpkgs": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9748,14 +10750,13 @@ "cardano-prelude": "cardano-prelude_7", "emanote": "emanote_6", "flat": "flat_7", - "haskell-language-server": "haskell-language-server_20", + "haskell-language-server": "haskell-language-server_19", "haskell-nix": "haskell-nix_13", "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_7", "hercules-ci-effects": "hercules-ci-effects_7", "iohk-nix": "iohk-nix_13", "nixpkgs": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9795,7 +10796,6 @@ "nixpkgs": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9827,13 +10827,15 @@ "cardano-prelude": "cardano-prelude_9", "emanote": "emanote_8", "flat": "flat_9", - "haskell-language-server": "haskell-language-server_25", + "haskell-language-server": "haskell-language-server_26", "haskell-nix": "haskell-nix_17", "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_9", "hercules-ci-effects": "hercules-ci-effects_9", "iohk-nix": "iohk-nix_17", "nixpkgs": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "haskell-nix", "nixpkgs-unstable" @@ -9892,9 +10894,35 @@ "haskell-language-server": "haskell-language-server_29", "haskell-nix": "haskell-nix_20", "iohk-nix": "iohk-nix_20", - "nixpkgs": "nixpkgs_49", + "nixpkgs": "nixpkgs_48", "pre-commit-hooks-nix": "pre-commit-hooks-nix_10", - "sphinxcontrib-haddock": "sphinxcontrib-haddock_10", + "sphinxcontrib-haddock": "sphinxcontrib-haddock_10" + }, + "locked": { + "lastModified": 1653669501, + "narHash": "sha256-qJrjEeo9Jmar1TwihDFzKQNC1ui4M03iClJM1zMd5Uk=", + "owner": "input-output-hk", + "repo": "plutus", + "rev": "fed48a71550a12290efc84eefb74305d93cde69d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "plutus", + "type": "github" + } + }, + "plutus_11": { + "inputs": { + "cardano-repo-tool": "cardano-repo-tool_11", + "gitignore-nix": "gitignore-nix_11", + "hackage-nix": "hackage-nix_11", + "haskell-language-server": "haskell-language-server_32", + "haskell-nix": "haskell-nix_22", + "iohk-nix": "iohk-nix_22", + "nixpkgs": "nixpkgs_54", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_11", + "sphinxcontrib-haddock": "sphinxcontrib-haddock_11", "stackage-nix": "stackage-nix" }, "locked": { @@ -9943,10 +10971,10 @@ "cardano-repo-tool": "cardano-repo-tool_3", "gitignore-nix": "gitignore-nix_3", "hackage-nix": "hackage-nix_3", - "haskell-language-server": "haskell-language-server_8", + "haskell-language-server": "haskell-language-server_9", "haskell-nix": "haskell-nix_6", "iohk-nix": "iohk-nix_6", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_15", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "sphinxcontrib-haddock": "sphinxcontrib-haddock_3" }, @@ -10047,7 +11075,7 @@ "cardano-repo-tool": "cardano-repo-tool_7", "gitignore-nix": "gitignore-nix_7", "hackage-nix": "hackage-nix_7", - "haskell-language-server": "haskell-language-server_21", + "haskell-language-server": "haskell-language-server_20", "haskell-nix": "haskell-nix_14", "iohk-nix": "iohk-nix_14", "nixpkgs": "nixpkgs_33", @@ -10099,7 +11127,7 @@ "cardano-repo-tool": "cardano-repo-tool_9", "gitignore-nix": "gitignore-nix_9", "hackage-nix": "hackage-nix_9", - "haskell-language-server": "haskell-language-server_26", + "haskell-language-server": "haskell-language-server_27", "haskell-nix": "haskell-nix_18", "iohk-nix": "iohk-nix_18", "nixpkgs": "nixpkgs_43", @@ -10152,6 +11180,22 @@ "type": "github" } }, + "pre-commit-hooks-nix_11": { + "flake": false, + "locked": { + "lastModified": 1624971177, + "narHash": "sha256-Amf/nBj1E77RmbSSmV+hg6YOpR+rddCbbVgo5C7BS0I=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "397f0713d007250a2c7a745e555fa16c5dc8cadb", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix_2": { "flake": false, "locked": { @@ -10297,6 +11341,22 @@ } }, "protolude_10": { + "flake": false, + "locked": { + "lastModified": 1647139352, + "narHash": "sha256-JyHAQfTTUswP8MeGEZibx/2/v01Q7cU5mNpnmDazh24=", + "owner": "protolude", + "repo": "protolude", + "rev": "3e249724fd0ead27370c8c297b1ecd38f92cbd5b", + "type": "github" + }, + "original": { + "owner": "protolude", + "repo": "protolude", + "type": "github" + } + }, + "protolude_11": { "flake": false, "locked": { "lastModified": 1637276813, @@ -10452,11 +11512,11 @@ "plutarch", "nixpkgs" ], - "nixpkgs-2111": "nixpkgs-2111_5", - "nixpkgs-latest": "nixpkgs-latest_5", - "plutarch": "plutarch_3", + "nixpkgs-2111": "nixpkgs-2111_7", + "nixpkgs-latest": "nixpkgs-latest_7", + "plutarch": "plutarch_4", "plutarch-context-builder": "plutarch-context-builder", - "plutarch-numeric": "plutarch-numeric", + "plutarch-numeric": "plutarch-numeric_2", "plutarch-quickcheck": "plutarch-quickcheck_2", "plutarch-safe-money": "plutarch-safe-money" } @@ -10477,6 +11537,22 @@ "type": "github" } }, + "secp256k1-haskell_10": { + "flake": false, + "locked": { + "lastModified": 1650290419, + "narHash": "sha256-XrjiqCC7cNTFib78gdMPGNettAkwAxQlbC/n+/mRFt4=", + "owner": "haskoin", + "repo": "secp256k1-haskell", + "rev": "3df963ab6ae14ec122691a97af09a7331511a387", + "type": "github" + }, + "original": { + "owner": "haskoin", + "repo": "secp256k1-haskell", + "type": "github" + } + }, "secp256k1-haskell_2": { "flake": false, "locked": { @@ -10654,6 +11730,22 @@ "type": "github" } }, + "sphinxcontrib-haddock_11": { + "flake": false, + "locked": { + "lastModified": 1594136664, + "narHash": "sha256-O9YT3iCUBHP3CEF88VDLLCO2HSP3HqkNA2q2939RnVY=", + "owner": "michaelpj", + "repo": "sphinxcontrib-haddock", + "rev": "f3956b3256962b2d27d5a4e96edb7951acf5de34", + "type": "github" + }, + "original": { + "owner": "michaelpj", + "repo": "sphinxcontrib-haddock", + "type": "github" + } + }, "sphinxcontrib-haddock_2": { "flake": false, "locked": { @@ -10815,6 +11907,22 @@ } }, "stackage_10": { + "flake": false, + "locked": { + "lastModified": 1654046327, + "narHash": "sha256-IxX46Dh4OZpF3k7KPMa3tZSScYYGqFxXpCnMc0QRkuQ=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "cc1d778723fcd431f9b2ed632a50c610c3e38b54", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_11": { "flake": false, "locked": { "lastModified": 1644887829, @@ -10985,11 +12093,32 @@ "type": "github" } }, + "tailwind-haskell_10": { + "inputs": { + "flake-compat": "flake-compat_21", + "flake-utils": "flake-utils_32", + "nixpkgs": "nixpkgs_51" + }, + "locked": { + "lastModified": 1649519562, + "narHash": "sha256-IVZ4D7JkSCn0sjeTw5b0s2TTIU+g4hk78u1znXY4JjQ=", + "owner": "srid", + "repo": "tailwind-haskell", + "rev": "f5bfc15da3ee6e74a077579fb10269bb450fa5cb", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "master", + "repo": "tailwind-haskell", + "type": "github" + } + }, "tailwind-haskell_2": { "inputs": { "ema": [ "liqwid-plutarch-extra", - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema" @@ -11016,14 +12145,15 @@ "tailwind-haskell_3": { "inputs": { "ema": [ - "plutarch-context-builder", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema" ], "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_15" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1653230344, @@ -11043,7 +12173,7 @@ "tailwind-haskell_4": { "inputs": { "ema": [ - "plutarch-numeric", + "plutarch-context-builder", "plutarch", "emanote", "ema" @@ -11070,7 +12200,7 @@ "tailwind-haskell_5": { "inputs": { "ema": [ - "plutarch-quickcheck", + "plutarch-numeric", "plutarch", "emanote", "ema" @@ -11097,8 +12227,7 @@ "tailwind-haskell_6": { "inputs": { "ema": [ - "plutarch-safe-money", - "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema" @@ -11127,7 +12256,6 @@ "ema": [ "plutarch-safe-money", "liqwid-plutarch-extra", - "plutarch-quickcheck", "plutarch", "emanote", "ema" @@ -11155,6 +12283,8 @@ "inputs": { "ema": [ "plutarch-safe-money", + "liqwid-plutarch-extra", + "plutarch-quickcheck", "plutarch", "emanote", "ema" @@ -11180,16 +12310,22 @@ }, "tailwind-haskell_9": { "inputs": { - "flake-compat": "flake-compat_19", - "flake-utils": "flake-utils_29", - "nixpkgs": "nixpkgs_46" + "ema": [ + "plutarch-safe-money", + "plutarch", + "emanote", + "ema" + ], + "flake-compat": "flake-compat_18", + "flake-utils": "flake-utils_27", + "nixpkgs": "nixpkgs_45" }, "locked": { - "lastModified": 1649519562, - "narHash": "sha256-IVZ4D7JkSCn0sjeTw5b0s2TTIU+g4hk78u1znXY4JjQ=", + "lastModified": 1653230344, + "narHash": "sha256-MNwayqvZHsIsP1uyqwQFvzcfFGBMejzZOqAapDjrV5I=", "owner": "srid", "repo": "tailwind-haskell", - "rev": "f5bfc15da3ee6e74a077579fb10269bb450fa5cb", + "rev": "0fb8a18b0e770bafc17521836658f31c56e6dfdb", "type": "github" }, "original": { @@ -11218,9 +12354,9 @@ }, "unionmount": { "inputs": { - "flake-compat": "flake-compat_20", - "flake-utils": "flake-utils_30", - "nixpkgs": "nixpkgs_47" + "flake-compat": "flake-compat_22", + "flake-utils": "flake-utils_33", + "nixpkgs": "nixpkgs_52" }, "locked": { "lastModified": 1649012450, diff --git a/flake.nix b/flake.nix index 2573c31..15ef898 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ "plutarch/haskell-nix/nixpkgs-unstable"; inputs.liqwid-plutarch-extra.url = - "github:Liqwid-Labs/liqwid-plutarch-extra?ref=main"; + "github:Liqwid-Labs/liqwid-plutarch-extra?rev=6bcd6068593b00adc4a1afd59b127398ea37d770"; inputs.plutarch-numeric.url = "github:Liqwid-Labs/plutarch-numeric?ref=main"; inputs.plutarch-safe-money.url = From e428b504d7f261b47742ba9f9e3867c5332e8890 Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Thu, 23 Jun 2022 19:24:36 +0800 Subject: [PATCH 2/4] encode some enum types as integer on chain --- agora/Agora/Governor.hs | 52 +++++++++++++++++------------ agora/Agora/Governor/Scripts.hs | 29 ++++++++-------- agora/Agora/Proposal.hs | 43 ++++++++++++++---------- agora/Agora/Proposal/Scripts.hs | 26 ++++++++------- agora/Agora/Treasury.hs | 59 +++++++++++++++++---------------- bench.csv | 48 +++++++++++++-------------- 6 files changed, 140 insertions(+), 117 deletions(-) diff --git a/agora/Agora/Governor.hs b/agora/Agora/Governor.hs index 9df17ea..6a6771c 100644 --- a/agora/Agora/Governor.hs +++ b/agora/Agora/Governor.hs @@ -45,6 +45,11 @@ import Plutarch.DataRepr ( PIsDataReprInstances (PIsDataReprInstances), ) import Plutarch.Extra.Comonad (pextract) +import Plutarch.Extra.IsData ( + DerivePConstantViaEnum (..), + EnumIsData (..), + ) +import Plutarch.Extra.Other (DerivePNewtype' (..)) import Plutarch.Extra.TermCont (pletC, pletFieldsC, pmatchC) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (..)) import Plutarch.SafeMoney (PDiscrete (..)) @@ -92,15 +97,27 @@ data GovernorRedeemer MintGATs | -- | Allows effects to mutate the parameters. MutateGovernor - deriving stock (Show, GHC.Generic) - --- | @since 0.1.0 -PlutusTx.makeIsDataIndexed - ''GovernorRedeemer - [ ('CreateProposal, 0) - , ('MintGATs, 1) - , ('MutateGovernor, 2) - ] + deriving stock + ( -- | @since 0.1.0 + Show + , -- | @since 0.1.0 + GHC.Generic + , -- | @since 0.2.0 + Enum + , -- | @since 0.2.0 + Bounded + ) + deriving anyclass + ( -- | @since 0.2.0 + Generic + ) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + ) + via (EnumIsData GovernorRedeemer) {- | Parameters for creating Governor scripts. @@ -172,10 +189,8 @@ deriving via PAsData (PIsDataReprInstances PGovernorDatum) instance PTryFrom PDa @since 0.1.0 -} -data PGovernorRedeemer (s :: S) - = PCreateProposal (Term s (PDataRecord '[])) - | PMintGATs (Term s (PDataRecord '[])) - | PMutateGovernor (Term s (PDataRecord '[])) +newtype PGovernorRedeemer (s :: S) + = PGovernorRedeemer (Term s PInteger) deriving stock ( -- | @since 0.1.0 GHC.Generic @@ -184,26 +199,19 @@ data PGovernorRedeemer (s :: S) ( -- | @since 0.1.0 Generic ) - deriving anyclass - ( -- | @since 0.1.0 - PIsDataRepr - ) deriving ( -- | @since 0.1.0 PlutusType , -- | @since 0.1.0 PIsData ) - via PIsDataReprInstances PGovernorRedeemer + via (DerivePNewtype' PGovernorRedeemer) -- | @since 0.1.0 instance PUnsafeLiftDecl PGovernorRedeemer where type PLifted PGovernorRedeemer = GovernorRedeemer -- | @since 0.1.0 -deriving via (DerivePConstantViaData GovernorRedeemer PGovernorRedeemer) instance (PConstantDecl GovernorRedeemer) - --- | @since 0.1.0 -deriving via PAsData (PIsDataReprInstances PGovernorRedeemer) instance PTryFrom PData (PAsData PGovernorRedeemer) +deriving via (DerivePConstantViaEnum GovernorRedeemer PGovernorRedeemer) instance (PConstantDecl GovernorRedeemer) -------------------------------------------------------------------------------- diff --git a/agora/Agora/Governor/Scripts.hs b/agora/Agora/Governor/Scripts.hs index e617a76..2b5533e 100644 --- a/agora/Agora/Governor/Scripts.hs +++ b/agora/Agora/Governor/Scripts.hs @@ -39,18 +39,17 @@ import Agora.AuthorityToken ( ) import Agora.Governor ( Governor (gstOutRef, gtClassRef, maximumCosigners), + GovernorRedeemer (..), PGovernorDatum (PGovernorDatum), - PGovernorRedeemer (PCreateProposal, PMintGATs, PMutateGovernor), governorDatumValid, pgetNextProposalId, ) import Agora.Proposal ( PProposalDatum (..), PProposalId (..), - PProposalStatus (PFinished), PResultTag, Proposal (..), - ProposalStatus (Draft, Locked), + ProposalStatus (Draft, Finished, Locked), pemptyVotesFor, pneutralOption, proposalDatumValid, @@ -105,20 +104,20 @@ import Plutarch.Api.V1.AssetClass ( passetClass, passetClassValueOf, ) +import Plutarch.Api.V1.ScriptContext (pfindTxInByTxOutRef, pisUTXOSpent, ptryFindDatum, ptxSignedBy, pvalueSpent) +import "liqwid-plutarch-extra" Plutarch.Api.V1.Value (psymbolValueOf) +import Plutarch.Extra.IsData (pmatchEnumFromData) import Plutarch.Extra.Map ( pkeys, plookup, plookup', ) +import Plutarch.Extra.Maybe (pisDJust) +import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC, ptryFromC) import Plutarch.SafeMoney (PDiscrete (..), pvalueDiscrete') -import Plutarch.TryFrom () -------------------------------------------------------------------------------- -import Plutarch.Api.V1.ScriptContext (pfindTxInByTxOutRef, pisUTXOSpent, ptryFindDatum, ptxSignedBy, pvalueSpent) -import "liqwid-plutarch-extra" Plutarch.Api.V1.Value (psymbolValueOf) -import Plutarch.Extra.Maybe (pisDJust) -import Plutarch.Extra.TermCont import PlutusLedgerApi.V1 ( CurrencySymbol (..), MintingPolicy, @@ -280,7 +279,6 @@ governorPolicy gov = governorValidator :: Governor -> ClosedTerm PValidator governorValidator gov = plam $ \datum' redeemer' ctx' -> unTermCont $ do - (pfromData -> redeemer, _) <- ptryFromC redeemer' ctxF <- pletFieldsC @'["txInfo", "purpose"] ctx' txInfo' <- pletC $ pfromData $ ctxF.txInfo @@ -330,8 +328,8 @@ governorValidator gov = pguardC "New datum is not valid" $ governorDatumValid # newGovernorDatum pure $ - pmatch redeemer $ \case - PCreateProposal _ -> unTermCont $ do + pmatchEnumFromData redeemer' $ \case + Just CreateProposal -> unTermCont $ do -- Check that the transaction advances proposal id. let expectedNextProposalId = pgetNextProposalId # oldGovernorDatumF.nextProposalId @@ -516,7 +514,7 @@ governorValidator gov = -------------------------------------------------------------------------- - PMintGATs _ -> unTermCont $ do + Just MintGATs -> unTermCont $ do pguardC "Governor state should not be changed" $ newGovernorDatum #== oldGovernorDatum -- Filter out proposal inputs and ouputs using PST and the address of proposal validator. @@ -583,7 +581,7 @@ governorValidator gov = PProposalDatum ( #proposalId .= proposalInputDatumF.proposalId .& #effects .= proposalInputDatumF.effects - .& #status .= pdata (pcon $ PFinished pdnil) + .& #status .= pconstantData Finished .& #cosigners .= proposalInputDatumF.cosigners .& #thresholds .= proposalInputDatumF.thresholds .& #votes .= proposalInputDatumF.votes @@ -667,9 +665,12 @@ governorValidator gov = -------------------------------------------------------------------------- - PMutateGovernor _ -> unTermCont $ do + Just MutateGovernor -> unTermCont $ do -- Check that a GAT is burnt. pure $ popaque $ singleAuthorityTokenBurned patSymbol ctxF.txInfo txInfoF.mint + + -------------------------------------------------------------------------- + Nothing -> ptraceError "Unknown redeemer" where -- Get th amount of governance tokens in a value. pgtValueOf :: Term s (PValue _ _ :--> PDiscrete GTTag) diff --git a/agora/Agora/Proposal.hs b/agora/Agora/Proposal.hs index b777c7f..bf539f6 100644 --- a/agora/Agora/Proposal.hs +++ b/agora/Agora/Proposal.hs @@ -51,9 +51,14 @@ import Plutarch.Api.V1 ( PValidatorHash, ) import Plutarch.DataRepr (DerivePConstantViaData (..), PDataFields, PIsDataReprInstances (..)) +import Plutarch.Extra.IsData ( + DerivePConstantViaEnum (..), + EnumIsData (..), + ) import Plutarch.Extra.List (pnotNull) import Plutarch.Extra.Map qualified as PM import Plutarch.Extra.Map.Unsorted qualified as PUM +import Plutarch.Extra.Other (DerivePNewtype' (..)) import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC) import Plutarch.Lift ( DerivePConstantViaNewtype (..), @@ -173,10 +178,24 @@ data ProposalStatus Show , -- | @since 0.1.0 GHC.Generic + , -- | @since 0.2.0 + Enum + , -- | @since 0.2.0 + Bounded ) - --- | @since 0.1.0 -PlutusTx.makeIsDataIndexed ''ProposalStatus [('Draft, 0), ('VotingReady, 1), ('Locked, 2), ('Finished, 3)] + deriving anyclass + ( -- | @since 0.2.0 + Generic + ) + deriving + ( -- | @since 0.1.0 + PlutusTx.FromData + , -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.UnsafeFromData + ) + via (EnumIsData ProposalStatus) {- | The threshold values for various state transitions to happen. This data is stored centrally (in the 'Agora.Governor.Governor') and copied over @@ -433,13 +452,7 @@ deriving via @since 0.1.0 -} -data PProposalStatus (s :: S) - = -- TODO: 'PProposalStatus' ought te be encoded as 'PInteger'. - -- e.g. like Tilde used 'pmatchEnum'. - PDraft (Term s (PDataRecord '[])) - | PVotingReady (Term s (PDataRecord '[])) - | PLocked (Term s (PDataRecord '[])) - | PFinished (Term s (PDataRecord '[])) +newtype PProposalStatus (s :: S) = PProposalStatus (Term s PInteger) deriving stock ( -- | @since 0.1.0 GHC.Generic @@ -448,10 +461,6 @@ data PProposalStatus (s :: S) ( -- | @since 0.1.0 Generic ) - deriving anyclass - ( -- | @since 0.1.0 - PIsDataRepr - ) deriving ( -- | @since 0.1.0 PlutusType @@ -460,16 +469,16 @@ data PProposalStatus (s :: S) , -- | @since 0.1.0 PEq ) - via PIsDataReprInstances PProposalStatus + via (DerivePNewtype' PProposalStatus) -- | @since 0.1.0 instance PUnsafeLiftDecl PProposalStatus where type PLifted PProposalStatus = ProposalStatus -- | @since 0.1.0 -deriving via PAsData (PIsDataReprInstances PProposalStatus) instance PTryFrom PData (PAsData PProposalStatus) +deriving via PAsData (DerivePNewtype' PProposalStatus) instance PTryFrom PData (PAsData PProposalStatus) -- | @since 0.1.0 -deriving via (DerivePConstantViaData ProposalStatus PProposalStatus) instance (PConstantDecl ProposalStatus) +deriving via (DerivePConstantViaEnum ProposalStatus PProposalStatus) instance (PConstantDecl ProposalStatus) {- | Plutarch-level version of 'ProposalThresholds'. diff --git a/agora/Agora/Proposal/Scripts.hs b/agora/Agora/Proposal/Scripts.hs index 24a41ea..c15aefb 100644 --- a/agora/Agora/Proposal/Scripts.hs +++ b/agora/Agora/Proposal/Scripts.hs @@ -13,7 +13,6 @@ module Agora.Proposal.Scripts ( import Agora.Proposal ( PProposalDatum (PProposalDatum), PProposalRedeemer (..), - PProposalStatus (..), PProposalVotes (PProposalVotes), Proposal (governorSTAssetClass, stakeSTAssetClass), ProposalStatus (..), @@ -55,6 +54,7 @@ import Plutarch.Api.V1.ScriptContext ( ) import "liqwid-plutarch-extra" Plutarch.Api.V1.Value (psymbolValueOf) import Plutarch.Extra.Comonad (pextract) +import Plutarch.Extra.IsData (pmatchEnum) import Plutarch.Extra.List (pisUniqBy) import Plutarch.Extra.Map (plookup, pupdate) import Plutarch.Extra.Maybe (pisJust) @@ -510,19 +510,21 @@ proposalValidator proposal = inLockedPeriod <- pletC $ isLockingPeriod # proposalF.timingConfig # proposalF.startingTime # currentTime inExecutionPeriod <- pletC $ isExecutionPeriod # proposalF.timingConfig # proposalF.startingTime # currentTime + proposalStatus <- pletC $ pto $ pfromData proposalF.status + -- Check the timings. let isFinished = proposalF.status #== pconstantData Finished - notTooLate = pmatch (pfromData proposalF.status) $ \case - PDraft _ -> inDraftPeriod + notTooLate = pmatchEnum proposalStatus $ \case + Draft -> inDraftPeriod -- Can only advance after the voting period is over. - PVotingReady _ -> inLockedPeriod - PLocked _ -> inExecutionPeriod + VotingReady -> inLockedPeriod + Locked -> inExecutionPeriod _ -> pconstant False - notTooEarly = pmatch (pfromData proposalF.status) $ \case - PVotingReady _ -> pnot # inVotingPeriod - PLocked _ -> pnot # inLockedPeriod + notTooEarly = pmatchEnum (pto $ pfromData proposalF.status) $ \case + VotingReady -> pnot # inVotingPeriod + Locked -> pnot # inLockedPeriod _ -> pconstant True pguardC "Cannot advance ahead of time" notTooEarly @@ -534,8 +536,8 @@ proposalValidator proposal = pif notTooLate -- On time: advance to next status. - ( pmatch (pfromData proposalF.status) $ \case - PDraft _ -> unTermCont $ do + ( pmatchEnum proposalStatus $ \case + Draft -> unTermCont $ do -- TODO: Perform other necessary checks. -- 'Draft' -> 'VotingReady' @@ -543,7 +545,7 @@ proposalValidator proposal = proposalOutStatus #== pconstantData VotingReady pure $ popaque (pconstant ()) - PVotingReady _ -> unTermCont $ do + VotingReady -> unTermCont $ do -- 'VotingReady' -> 'Locked' pguardC "Proposal status set to Locked" $ proposalOutStatus #== pconstantData Locked @@ -554,7 +556,7 @@ proposalValidator proposal = $ pfromData thresholdsF.execute pure $ popaque (pconstant ()) - PLocked _ -> unTermCont $ do + Locked -> unTermCont $ do -- 'Locked' -> 'Finished' pguardC "Proposal status set to Finished" $ proposalOutStatus #== pconstantData Finished diff --git a/agora/Agora/Treasury.hs b/agora/Agora/Treasury.hs index 1af783e..dd24c8d 100644 --- a/agora/Agora/Treasury.hs +++ b/agora/Agora/Treasury.hs @@ -12,15 +12,13 @@ module Agora.Treasury (module Agora.Treasury) where import Agora.AuthorityToken (singleAuthorityTokenBurned) import GHC.Generics qualified as GHC -import Generics.SOP (Generic, I (I)) +import Generics.SOP (Generic) import Plutarch.Api.V1 (PValidator) import Plutarch.Api.V1.Contexts (PScriptPurpose (PMinting)) import "plutarch" Plutarch.Api.V1.Value (PValue) -import Plutarch.DataRepr ( - DerivePConstantViaData (..), - PIsDataReprInstances (PIsDataReprInstances), - ) -import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC, ptryFromC) +import Plutarch.Extra.IsData (DerivePConstantViaEnum (..), EnumIsData (..), pmatchEnumFromData) +import Plutarch.Extra.Other (DerivePNewtype' (..)) +import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) import Plutarch.Lift (PConstantDecl (..), PLifted (..), PUnsafeLiftDecl) import Plutarch.TryFrom () import PlutusLedgerApi.V1.Value (CurrencySymbol) @@ -40,13 +38,22 @@ data TreasuryRedeemer Show , -- | @since 0.1.0 GHC.Generic + , -- | @since 0.2.0 + Enum + , -- | @since 0.2.0 + Bounded ) - --- | @since 0.1.0 -PlutusTx.makeIsDataIndexed - ''TreasuryRedeemer - [ ('SpendTreasuryGAT, 0) - ] + deriving anyclass + ( -- | @since 0.2.0 + Generic + ) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + ) + via (EnumIsData TreasuryRedeemer) -------------------------------------------------------------------------------- @@ -56,9 +63,7 @@ PlutusTx.makeIsDataIndexed @since 0.1.0 -} newtype PTreasuryRedeemer (s :: S) - = -- | Alters treasury parameters, subject to the burning of a - -- governance authority token. - PSpendTreasuryGAT (Term s (PDataRecord '[])) + = PTreasuryRedeemer (Term s PInteger) deriving stock ( -- | @since 0.1.0 GHC.Generic @@ -66,8 +71,6 @@ newtype PTreasuryRedeemer (s :: S) deriving anyclass ( -- | @since 0.1.0 Generic - , -- | @since 0.1.0 - PIsDataRepr ) deriving ( -- | @since 0.1.0 @@ -75,13 +78,7 @@ newtype PTreasuryRedeemer (s :: S) , -- | @since 0.1.0 PIsData ) - via PIsDataReprInstances PTreasuryRedeemer - --- | @since 0.1.0 -deriving via - PAsData (PIsDataReprInstances PTreasuryRedeemer) - instance - PTryFrom PData (PAsData PTreasuryRedeemer) + via (DerivePNewtype' PTreasuryRedeemer) -- | @since 0.1.0 instance PUnsafeLiftDecl PTreasuryRedeemer where @@ -89,7 +86,7 @@ instance PUnsafeLiftDecl PTreasuryRedeemer where -- | @since 0.1.0 deriving via - (DerivePConstantViaData TreasuryRedeemer PTreasuryRedeemer) + (DerivePConstantViaEnum TreasuryRedeemer PTreasuryRedeemer) instance (PConstantDecl TreasuryRedeemer) @@ -105,8 +102,6 @@ treasuryValidator :: CurrencySymbol -> ClosedTerm PValidator treasuryValidator gatCs' = plam $ \_datum redeemer ctx' -> unTermCont $ do - (treasuryRedeemer, _) <- ptryFromC redeemer - -- plet required fields from script context. ctx <- pletFieldsC @["txInfo", "purpose"] ctx' @@ -114,7 +109,15 @@ treasuryValidator gatCs' = plam $ \_datum redeemer ctx' -> unTermCont $ do PMinting _ <- pmatchC ctx.purpose -- Ensure redeemer type is valid. - PSpendTreasuryGAT _ <- pmatchC $ pfromData treasuryRedeemer + let redeemerValid = + pmatchEnumFromData + redeemer + ( \case + Just SpendTreasuryGAT -> pconstant True + _ -> pconstant False + ) + + pguardC "Redeemer should be SpendTreasuryGAT" redeemerValid -- Get the minted value from txInfo. txInfo' <- pletC ctx.txInfo diff --git a/bench.csv b/bench.csv index 723eb3a..7a27393 100644 --- a/bench.csv +++ b/bench.csv @@ -2,36 +2,36 @@ name,cpu,mem,size Agora/Effects/Treasury Withdrawal Effect/effect/Simple,333327612,830203,3674 Agora/Effects/Treasury Withdrawal Effect/effect/Simple with multiple treasuries ,492387542,1197315,3986 Agora/Effects/Treasury Withdrawal Effect/effect/Mixed Assets,456007605,1104500,3859 -Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/governor validator should pass,90397270,249528,8807 +Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/governor validator should pass,87839169,243032,8733 Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/effect validator should pass,106082031,292993,3609 Agora/Stake/policy/stakeCreation,52241265,152127,2514 Agora/Stake/validator/stakeDepositWithdraw deposit,180880812,492023,4431 Agora/Stake/validator/stakeDepositWithdraw withdraw,180880812,492023,4419 -Agora/Proposal/policy/proposalCreation,23140177,69194,1519 -Agora/Proposal/validator/cosignature/proposal,338483402,961112,8620 -Agora/Proposal/validator/cosignature/stake,126327509,315061,4968 -Agora/Proposal/validator/voting/proposal,296656410,830692,8549 -Agora/Proposal/validator/voting/stake,121170376,320853,4942 -Agora/Proposal/validator/advancing/successfully advance to next state/Draft -> VotringReady,294340341,825452,8447 -Agora/Proposal/validator/advancing/successfully advance to next state/VotingReady -> Locked,306801371,861382,8456 -Agora/Proposal/validator/advancing/successfully advance to next state/Locked -> Finished,295193386,827555,8456 -Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Draft -> Finished,293210540,822722,8449 -Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/VotingReady -> Finished,291801629,820017,8450 -Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Locked -> Finished,292932607,822421,8450 -"Agora/Proposal/validator/unlocking/legal/1 proposals, voter, unlock stake + retract votes, VotingReady",302502183,848154,8500 -"Agora/Proposal/validator/unlocking/legal/1 proposals, creator, unlock stake, Finished",273224492,773388,8504 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Finished",268700821,763033,8504 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Locked",268700821,763033,8504 -"Agora/Proposal/validator/unlocking/legal/42 proposals, voter, unlock stake + retract votes, VotingReady",2908014422,8180225,30018 -"Agora/Proposal/validator/unlocking/legal/42 proposals, creator, unlock stake, Finished",2616129517,7383326,30287 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Finished",2464384686,6936321,30187 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2464384686,6936321,30187 +Agora/Proposal/policy/proposalCreation,23140177,69194,1517 +Agora/Proposal/validator/cosignature/proposal,339142002,963240,8640 +Agora/Proposal/validator/cosignature/stake,126327509,315061,4964 +Agora/Proposal/validator/voting/proposal,296502589,833052,8568 +Agora/Proposal/validator/voting/stake,121170376,320853,4937 +Agora/Proposal/validator/advancing/successfully advance to next state/Draft -> VotringReady,291922922,820018,8473 +Agora/Proposal/validator/advancing/successfully advance to next state/VotingReady -> Locked,307211397,861958,8482 +Agora/Proposal/validator/advancing/successfully advance to next state/Locked -> Finished,295603412,828131,8482 +Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Draft -> Finished,291426433,819116,8475 +Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/VotingReady -> Finished,292844967,822421,8476 +Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Locked -> Finished,293975945,824825,8476 +"Agora/Proposal/validator/unlocking/legal/1 proposals, voter, unlock stake + retract votes, VotingReady",303185955,850282,8520 +"Agora/Proposal/validator/unlocking/legal/1 proposals, creator, unlock stake, Finished",273908264,775516,8524 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Finished",269372007,765161,8524 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Locked",269372007,765161,8524 +"Agora/Proposal/validator/unlocking/legal/42 proposals, voter, unlock stake + retract votes, VotingReady",2908698194,8182353,29874 +"Agora/Proposal/validator/unlocking/legal/42 proposals, creator, unlock stake, Finished",2616813289,7385454,30143 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Finished",2465055872,6938449,30042 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2465055872,6938449,30042 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900 -Agora/Treasury/Validator/Positive/Allows for effect changes,29938856,79744,1391 +Agora/Treasury/Validator/Positive/Allows for effect changes,30996258,82579,1462 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900 Agora/Governor/policy/GST minting,51007235,144191,2034 -Agora/Governor/validator/proposal creation,317651809,854963,9323 -Agora/Governor/validator/GATs minting,423756405,1151000,9444 -Agora/Governor/validator/mutate governor state,91544121,254987,8908 +Agora/Governor/validator/proposal creation,315830140,850201,9247 +Agora/Governor/validator/GATs minting,421359049,1145136,9364 +Agora/Governor/validator/mutate governor state,88986020,248491,8834 From f26442fb0bbe6a3ee4520f97a9d33a44d4f4fe4c Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Thu, 23 Jun 2022 22:36:49 +0800 Subject: [PATCH 3/4] apply Emily's suggestions --- agora/Agora/Treasury.hs | 14 ++++---------- bench.csv | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/agora/Agora/Treasury.hs b/agora/Agora/Treasury.hs index dd24c8d..16d5a51 100644 --- a/agora/Agora/Treasury.hs +++ b/agora/Agora/Treasury.hs @@ -16,7 +16,8 @@ import Generics.SOP (Generic) import Plutarch.Api.V1 (PValidator) import Plutarch.Api.V1.Contexts (PScriptPurpose (PMinting)) import "plutarch" Plutarch.Api.V1.Value (PValue) -import Plutarch.Extra.IsData (DerivePConstantViaEnum (..), EnumIsData (..), pmatchEnumFromData) +import Plutarch.Builtin (pforgetData) +import Plutarch.Extra.IsData (DerivePConstantViaEnum (..), EnumIsData (..)) import Plutarch.Extra.Other (DerivePNewtype' (..)) import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) import Plutarch.Lift (PConstantDecl (..), PLifted (..), PUnsafeLiftDecl) @@ -109,15 +110,8 @@ treasuryValidator gatCs' = plam $ \_datum redeemer ctx' -> unTermCont $ do PMinting _ <- pmatchC ctx.purpose -- Ensure redeemer type is valid. - let redeemerValid = - pmatchEnumFromData - redeemer - ( \case - Just SpendTreasuryGAT -> pconstant True - _ -> pconstant False - ) - - pguardC "Redeemer should be SpendTreasuryGAT" redeemerValid + pguardC "Redeemer should be SpendTreasuryGAT" $ + redeemer #== pforgetData (pconstantData SpendTreasuryGAT) -- Get the minted value from txInfo. txInfo' <- pletC ctx.txInfo diff --git a/bench.csv b/bench.csv index 7a27393..d41a816 100644 --- a/bench.csv +++ b/bench.csv @@ -28,7 +28,7 @@ Agora/Proposal/validator/advancing/successfully advance to failed state: timeout "Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2465055872,6938449,30042 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900 -Agora/Treasury/Validator/Positive/Allows for effect changes,30996258,82579,1462 +Agora/Treasury/Validator/Positive/Allows for effect changes,31556709,81546,1452 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900 Agora/Governor/policy/GST minting,51007235,144191,2034 From 4d7e323e01d0c6044a932add5d5fc288fe8ffc2d Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Sat, 25 Jun 2022 16:14:42 +0800 Subject: [PATCH 4/4] efficiently encode proposal datum on chain --- agora/Agora/Proposal.hs | 39 ++++++++++++++++--------- agora/Agora/Proposal/Time.hs | 26 +++++++++++------ agora/Agora/Stake.hs | 39 ++++++++++++++++++------- bench.csv | 56 ++++++++++++++++++------------------ 4 files changed, 101 insertions(+), 59 deletions(-) diff --git a/agora/Agora/Proposal.hs b/agora/Agora/Proposal.hs index bf539f6..55f22ba 100644 --- a/agora/Agora/Proposal.hs +++ b/agora/Agora/Proposal.hs @@ -52,8 +52,10 @@ import Plutarch.Api.V1 ( ) import Plutarch.DataRepr (DerivePConstantViaData (..), PDataFields, PIsDataReprInstances (..)) import Plutarch.Extra.IsData ( + DerivePConstantViaDataList (..), DerivePConstantViaEnum (..), EnumIsData (..), + ProductIsData (ProductIsData), ) import Plutarch.Extra.List (pnotNull) import Plutarch.Extra.Map qualified as PM @@ -223,9 +225,16 @@ data ProposalThresholds = ProposalThresholds , -- | @since 0.1.0 GHC.Generic ) - --- | @since 0.1.0 -PlutusTx.makeIsDataIndexed ''ProposalThresholds [('ProposalThresholds, 0)] + deriving anyclass (Generic) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + , -- | @since 0.1.0 + PlutusTx.UnsafeFromData + ) + via (ProductIsData ProposalThresholds) {- | Map which encodes the total tally for each result. It's important that the "shape" is consistent with the shape of 'effects'. @@ -248,8 +257,6 @@ newtype ProposalVotes = ProposalVotes PlutusTx.ToData , -- | @since 0.1.0 PlutusTx.FromData - , -- | @since 0.1.0 - PlutusTx.UnsafeFromData ) deriving stock ( -- | @since 0.1.0 @@ -300,8 +307,14 @@ data ProposalDatum = ProposalDatum , -- | @since 0.1.0 GHC.Generic ) - -PlutusTx.makeIsDataIndexed ''ProposalDatum [('ProposalDatum, 0)] + deriving anyclass (Generic) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + ) + via (ProductIsData ProposalDatum) {- | Haskell-level redeemer for Proposal scripts. @@ -515,11 +528,11 @@ newtype PProposalThresholds (s :: S) = PProposalThresholds , -- | @since 0.1.0 PDataFields ) - via (PIsDataReprInstances PProposalThresholds) + via (DerivePNewtype' PProposalThresholds) -- | @since 0.1.0 deriving via - PAsData (PIsDataReprInstances PProposalThresholds) + PAsData (DerivePNewtype' PProposalThresholds) instance PTryFrom PData (PAsData PProposalThresholds) @@ -528,7 +541,7 @@ instance PUnsafeLiftDecl PProposalThresholds where type PLifted PProposalThresho -- | @since 0.1.0 deriving via - (DerivePConstantViaData ProposalThresholds PProposalThresholds) + (DerivePConstantViaDataList ProposalThresholds PProposalThresholds) instance (PConstantDecl ProposalThresholds) @@ -637,16 +650,16 @@ newtype PProposalDatum (s :: S) = PProposalDatum , -- | @since 0.1.0 PEq ) - via (PIsDataReprInstances PProposalDatum) + via (DerivePNewtype' PProposalDatum) -- | @since 0.1.0 -deriving via PAsData (PIsDataReprInstances PProposalDatum) instance PTryFrom PData (PAsData PProposalDatum) +deriving via PAsData (DerivePNewtype' PProposalDatum) instance PTryFrom PData (PAsData PProposalDatum) -- | @since 0.1.0 instance PUnsafeLiftDecl PProposalDatum where type PLifted PProposalDatum = ProposalDatum -- | @since 0.1.0 -deriving via (DerivePConstantViaData ProposalDatum PProposalDatum) instance (PConstantDecl ProposalDatum) +deriving via (DerivePConstantViaDataList ProposalDatum PProposalDatum) instance (PConstantDecl ProposalDatum) {- | Plutarch-level version of 'ProposalRedeemer'. diff --git a/agora/Agora/Proposal/Time.hs b/agora/Agora/Proposal/Time.hs index bf642e7..d74d847 100644 --- a/agora/Agora/Proposal/Time.hs +++ b/agora/Agora/Proposal/Time.hs @@ -40,10 +40,13 @@ import Plutarch.Api.V1 ( PUpperBound (PUpperBound), ) import Plutarch.DataRepr ( - DerivePConstantViaData (..), PDataFields, - PIsDataReprInstances (..), ) +import Plutarch.Extra.IsData ( + DerivePConstantViaDataList (..), + ProductIsData (ProductIsData), + ) +import Plutarch.Extra.Other (DerivePNewtype' (..)) import Plutarch.Extra.TermCont (pguardC, pletFieldsC, pmatchC) import Plutarch.Lift ( DerivePConstantViaNewtype (..), @@ -91,9 +94,16 @@ data ProposalTimingConfig = ProposalTimingConfig , -- | @since 0.1.0 GHC.Generic ) - --- | @since 0.1.0 -PlutusTx.makeIsDataIndexed ''ProposalTimingConfig [('ProposalTimingConfig, 0)] + deriving anyclass (Generic) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + , -- | @since 0.1.0 + PlutusTx.UnsafeFromData + ) + via (ProductIsData ProposalTimingConfig) -- | Represents the maximum width of a 'PlutusLedgerApi.V1.Time.POSIXTimeRange'. newtype MaxTimeRangeWidth = MaxTimeRangeWidth {getMaxWidth :: POSIXTime} @@ -229,10 +239,10 @@ newtype PProposalTimingConfig (s :: S) = PProposalTimingConfig , -- | @since 0.1.0 PDataFields ) - via (PIsDataReprInstances PProposalTimingConfig) + via (DerivePNewtype' PProposalTimingConfig) -- | @since 0.1.0 -deriving via PAsData (PIsDataReprInstances PProposalTimingConfig) instance PTryFrom PData (PAsData PProposalTimingConfig) +deriving via PAsData (DerivePNewtype' PProposalTimingConfig) instance PTryFrom PData (PAsData PProposalTimingConfig) -- | @since 0.1.0 instance PUnsafeLiftDecl PProposalTimingConfig where @@ -240,7 +250,7 @@ instance PUnsafeLiftDecl PProposalTimingConfig where -- | @since 0.1.0 deriving via - (DerivePConstantViaData ProposalTimingConfig PProposalTimingConfig) + (DerivePConstantViaDataList ProposalTimingConfig PProposalTimingConfig) instance (PConstantDecl ProposalTimingConfig) diff --git a/agora/Agora/Stake.hs b/agora/Agora/Stake.hs index 6ab4e63..a4fded9 100644 --- a/agora/Agora/Stake.hs +++ b/agora/Agora/Stake.hs @@ -48,7 +48,12 @@ import Plutarch.DataRepr ( PDataFields, PIsDataReprInstances (PIsDataReprInstances), ) +import Plutarch.Extra.IsData ( + DerivePConstantViaDataList (..), + ProductIsData (ProductIsData), + ) import Plutarch.Extra.List (pmapMaybe, pnotNull) +import Plutarch.Extra.Other (DerivePNewtype' (..)) import Plutarch.Extra.TermCont (pletC, pletFieldsC, pmatchC) import Plutarch.Internal (punsafeCoerce) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (..)) @@ -116,8 +121,16 @@ data ProposalLock = ProposalLock , -- | @since 0.1.0 GHC.Generic ) - -PlutusTx.makeIsDataIndexed ''ProposalLock [('ProposalLock, 0)] + deriving anyclass (Generic) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + , -- | @since 0.1.0 + PlutusTx.UnsafeFromData + ) + via (ProductIsData ProposalLock) {- | Haskell-level redeemer for Stake scripts. @@ -173,8 +186,14 @@ data StakeDatum = StakeDatum -- for the stake to be usable for deposits and withdrawals. } deriving stock (Show, GHC.Generic) - -PlutusTx.makeIsDataIndexed ''StakeDatum [('StakeDatum, 0)] + deriving anyclass (Generic) + deriving + ( -- | @since 0.1.0 + PlutusTx.ToData + , -- | @since 0.1.0 + PlutusTx.FromData + ) + via (ProductIsData StakeDatum) -------------------------------------------------------------------------------- @@ -215,16 +234,16 @@ newtype PStakeDatum (s :: S) = PStakeDatum , -- | @since 0.1.0 PEq ) - via (PIsDataReprInstances PStakeDatum) + via (DerivePNewtype' PStakeDatum) -- | @since 0.1.0 instance Plutarch.Lift.PUnsafeLiftDecl PStakeDatum where type PLifted PStakeDatum = StakeDatum -- | @since 0.1.0 -deriving via (DerivePConstantViaData StakeDatum PStakeDatum) instance (Plutarch.Lift.PConstantDecl StakeDatum) +deriving via (DerivePConstantViaDataList StakeDatum PStakeDatum) instance (Plutarch.Lift.PConstantDecl StakeDatum) -- | @since 0.1.0 -deriving via PAsData (PIsDataReprInstances PStakeDatum) instance PTryFrom PData (PAsData PStakeDatum) +deriving via PAsData (DerivePNewtype' PStakeDatum) instance PTryFrom PData (PAsData PStakeDatum) {- | Plutarch-level redeemer for Stake scripts. @@ -285,15 +304,15 @@ newtype PProposalLock (s :: S) = PProposalLock deriving anyclass (PIsDataRepr) deriving (PlutusType, PIsData, PDataFields, PEq) - via (PIsDataReprInstances PProposalLock) + via (DerivePNewtype' PProposalLock) deriving via - PAsData (PIsDataReprInstances PProposalLock) + PAsData (DerivePNewtype' PProposalLock) instance PTryFrom PData (PAsData PProposalLock) instance Plutarch.Lift.PUnsafeLiftDecl PProposalLock where type PLifted PProposalLock = ProposalLock -deriving via (DerivePConstantViaData ProposalLock PProposalLock) instance (Plutarch.Lift.PConstantDecl ProposalLock) +deriving via (DerivePConstantViaDataList ProposalLock PProposalLock) instance (Plutarch.Lift.PConstantDecl ProposalLock) -------------------------------------------------------------------------------- diff --git a/bench.csv b/bench.csv index d41a816..7255728 100644 --- a/bench.csv +++ b/bench.csv @@ -2,36 +2,36 @@ name,cpu,mem,size Agora/Effects/Treasury Withdrawal Effect/effect/Simple,333327612,830203,3674 Agora/Effects/Treasury Withdrawal Effect/effect/Simple with multiple treasuries ,492387542,1197315,3986 Agora/Effects/Treasury Withdrawal Effect/effect/Mixed Assets,456007605,1104500,3859 -Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/governor validator should pass,87839169,243032,8733 -Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/effect validator should pass,106082031,292993,3609 -Agora/Stake/policy/stakeCreation,52241265,152127,2514 -Agora/Stake/validator/stakeDepositWithdraw deposit,180880812,492023,4431 -Agora/Stake/validator/stakeDepositWithdraw withdraw,180880812,492023,4419 -Agora/Proposal/policy/proposalCreation,23140177,69194,1517 -Agora/Proposal/validator/cosignature/proposal,339142002,963240,8640 -Agora/Proposal/validator/cosignature/stake,126327509,315061,4964 -Agora/Proposal/validator/voting/proposal,296502589,833052,8568 -Agora/Proposal/validator/voting/stake,121170376,320853,4937 -Agora/Proposal/validator/advancing/successfully advance to next state/Draft -> VotringReady,291922922,820018,8473 -Agora/Proposal/validator/advancing/successfully advance to next state/VotingReady -> Locked,307211397,861958,8482 -Agora/Proposal/validator/advancing/successfully advance to next state/Locked -> Finished,295603412,828131,8482 -Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Draft -> Finished,291426433,819116,8475 -Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/VotingReady -> Finished,292844967,822421,8476 -Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Locked -> Finished,293975945,824825,8476 -"Agora/Proposal/validator/unlocking/legal/1 proposals, voter, unlock stake + retract votes, VotingReady",303185955,850282,8520 -"Agora/Proposal/validator/unlocking/legal/1 proposals, creator, unlock stake, Finished",273908264,775516,8524 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Finished",269372007,765161,8524 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Locked",269372007,765161,8524 -"Agora/Proposal/validator/unlocking/legal/42 proposals, voter, unlock stake + retract votes, VotingReady",2908698194,8182353,29874 -"Agora/Proposal/validator/unlocking/legal/42 proposals, creator, unlock stake, Finished",2616813289,7385454,30143 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Finished",2465055872,6938449,30042 -"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2465055872,6938449,30042 +Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/governor validator should pass,96559225,271500,9112 +Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/effect validator should pass,114802087,321461,3723 +Agora/Stake/policy/stakeCreation,50939580,148729,2387 +Agora/Stake/validator/stakeDepositWithdraw deposit,181581435,493259,4413 +Agora/Stake/validator/stakeDepositWithdraw withdraw,181581435,493259,4401 +Agora/Proposal/policy/proposalCreation,23140177,69194,1503 +Agora/Proposal/validator/cosignature/proposal,325643495,929930,8840 +Agora/Proposal/validator/cosignature/stake,125315872,312659,4934 +Agora/Proposal/validator/voting/proposal,281136993,794418,8758 +Agora/Proposal/validator/voting/stake,120122971,320497,4891 +Agora/Proposal/validator/advancing/successfully advance to next state/Draft -> VotringReady,275767527,779218,8665 +Agora/Proposal/validator/advancing/successfully advance to next state/VotingReady -> Locked,290854622,820626,8674 +Agora/Proposal/validator/advancing/successfully advance to next state/Locked -> Finished,279448017,787331,8674 +Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Draft -> Finished,275271038,778316,8667 +Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/VotingReady -> Finished,276689572,781621,8668 +Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Locked -> Finished,277820550,784025,8668 +"Agora/Proposal/validator/unlocking/legal/1 proposals, voter, unlock stake + retract votes, VotingReady",289580399,816378,8718 +"Agora/Proposal/validator/unlocking/legal/1 proposals, creator, unlock stake, Finished",259859750,740610,8720 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Finished",256153418,732289,8722 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Locked",256153418,732289,8722 +"Agora/Proposal/validator/unlocking/legal/42 proposals, voter, unlock stake + retract votes, VotingReady",2828039393,7977807,29495 +"Agora/Proposal/validator/unlocking/legal/42 proposals, creator, unlock stake, Finished",2501684605,7096512,29680 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Finished",2393040618,6756747,29664 +"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2393040618,6756747,29664 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900 Agora/Treasury/Validator/Positive/Allows for effect changes,31556709,81546,1452 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900 -Agora/Governor/policy/GST minting,51007235,144191,2034 -Agora/Governor/validator/proposal creation,315830140,850201,9247 -Agora/Governor/validator/GATs minting,421359049,1145136,9364 -Agora/Governor/validator/mutate governor state,88986020,248491,8834 +Agora/Governor/policy/GST minting,55335573,158459,2162 +Agora/Governor/validator/proposal creation,322870773,877643,9616 +Agora/Governor/validator/GATs minting,440461675,1209344,9735 +Agora/Governor/validator/mutate governor state,97706076,276959,9217