From c53fb0d54f91f54d27fd10a67a48f522b6ddc609 Mon Sep 17 00:00:00 2001 From: Konstantinos Lambrou-Latreille Date: Wed, 21 Jun 2023 13:12:12 -0400 Subject: [PATCH 01/18] Upgrade GHC from 8.10.7 to 9.2.7 --- .../library/cabal-project-index-state.nix | 2 +- .../library/ghc-compiler-nix-name.nix | 2 +- flake.lock | 586 ++++-------------- 3 files changed, 108 insertions(+), 482 deletions(-) diff --git a/__std__/cells/plutus-apps/library/cabal-project-index-state.nix b/__std__/cells/plutus-apps/library/cabal-project-index-state.nix index 762cddf60a..4862aab524 100644 --- a/__std__/cells/plutus-apps/library/cabal-project-index-state.nix +++ b/__std__/cells/plutus-apps/library/cabal-project-index-state.nix @@ -2,4 +2,4 @@ { inputs, cell }: -cell.library.plutus-apps-project.index-state +cell.library.plutus-apps-project.index-state-max diff --git a/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix b/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix index bb8ff99fa7..9c48faaa81 100644 --- a/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix +++ b/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix @@ -2,4 +2,4 @@ { inputs, cell }: -"ghc8107" +"ghc927" diff --git a/flake.lock b/flake.lock index e89dcdd838..f7f8dc6ad6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1683628047, - "narHash": "sha256-p8H6fHmcTlerNB/SxHoWjXR5A0+rFUXJb39jP2jon1g=", + "lastModified": 1687312611, + "narHash": "sha256-Tvq04QEK/Kkj977GM3p7KxGtOrl15ef2y6OagSS5gtM=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "94cad9a3163ffc48b8d736ca9a448b4801b697e9", + "rev": "42e80e6600314053b7e0db2cb71725b9a1c8cdcf", "type": "github" }, "original": { @@ -48,21 +48,6 @@ "type": "github" } }, - "blank_2": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "cabal-32": { "flake": false, "locked": { @@ -83,11 +68,11 @@ "cabal-34": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", "owner": "haskell", "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", "type": "github" }, "original": { @@ -100,11 +85,11 @@ "cabal-36": { "flake": false, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", "owner": "haskell", "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", "type": "github" }, "original": { @@ -131,35 +116,6 @@ } }, "devshell": { - "inputs": { - "flake-utils": [ - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { "inputs": { "flake-utils": [ "std", @@ -185,35 +141,6 @@ } }, "dmerge": { - "inputs": { - "nixlib": [ - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "haskell-nix", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "dmerge_2": { "inputs": { "nixlib": [ "std", @@ -272,22 +199,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -305,65 +216,21 @@ }, "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, "flake-utils_2": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -378,7 +245,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -393,7 +260,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_4": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -466,25 +333,6 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "hackage-nix": { "flake": false, "locked": { @@ -531,6 +379,8 @@ "hackage": [ "hackage-nix" ], + "hls-1.10": "hls-1.10", + "hls-2.0": "hls-2.0", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -542,17 +392,17 @@ "nixpkgs-2111": "nixpkgs-2111", "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage", - "tullia": "tullia" + "stackage": "stackage" }, "locked": { - "lastModified": 1675900540, - "narHash": "sha256-yItNeUA3yG0VBle6PG0KOnKV/ZVMG8gAMLZKGp0HiWY=", + "lastModified": 1687308678, + "narHash": "sha256-Vlj+78vMgRQLPbHJYH3ZatYQW7RAk4xJTTaop3SYAzA=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "7075077d46e684d50e1b00759bb4590426c99c70", + "rev": "f1c9456823444534696710a2f78e61be3f10f2f8", "type": "github" }, "original": { @@ -561,6 +411,40 @@ "type": "github" } }, + "hls-1.10": { + "flake": false, + "locked": { + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.0": { + "flake": false, + "locked": { + "lastModified": 1684398654, + "narHash": "sha256-RW44up2BIyBBYN6tZur5f9kDDR3kr0Rd+TgPbLTfwB4=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "20c6d1e731cd9c0beef7338e2fc7a8126ba9b6fb", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -588,11 +472,11 @@ ] }, "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", "owner": "NixOS", "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", "type": "github" }, "original": { @@ -669,49 +553,9 @@ "type": "github" } }, - "mdbook-kroki-preprocessor_2": { - "flake": false, - "locked": { - "lastModified": 1661755005, - "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", - "type": "github" - }, - "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "type": "github" - } - }, "n2c": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": [ - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "n2c_2": { - "inputs": { - "flake-utils": "flake-utils_7", "nixpkgs": [ "std", "nixpkgs" @@ -738,110 +582,21 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", "owner": "NixOS", "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.6.0", + "ref": "2.11.0", "repo": "nix", "type": "github" } }, - "nix-nomad": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": [ - "haskell-nix", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix", - "nixpkgs": [ - "haskell-nix", - "tullia", - "nixpkgs" - ], - "nixpkgs-lib": [ - "haskell-nix", - "tullia", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", - "type": "github" - }, - "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", - "type": "github" - } - }, - "nix2container": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nixago": { - "inputs": { - "flake-utils": [ - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "haskell-nix", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixago_2": { "inputs": { "flake-utils": [ "std", @@ -872,17 +627,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-2003": { @@ -935,11 +691,11 @@ }, "nixpkgs-2205": { "locked": { - "lastModified": 1663981975, - "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", + "lastModified": 1682600000, + "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "309faedb8338d3ae8ad8f1043b3ccf48c9cc2970", + "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", "type": "github" }, "original": { @@ -951,11 +707,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1676253841, - "narHash": "sha256-jhuI8Mmky8VCD45OoJEuF6HdPLFBwNrHA0ljjZ/zkfw=", + "lastModified": 1685314633, + "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a45a8916243a7d27acc358f4fc18c4491f3eeca8", + "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", "type": "github" }, "original": { @@ -965,101 +721,71 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" - } - }, - "nixpkgs-stable": { + "nixpkgs-2305": { "locked": { - "lastModified": 1676177817, - "narHash": "sha256-OQnBnuKkpwkfNY31xQyfU5hNpLs1ilWt+hVY6ztEEOM=", + "lastModified": 1685338297, + "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b82144edfcd0c86486d2e07c7298f85510e7fb8", + "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixpkgs-23.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-regression": { "locked": { - "lastModified": 1663905476, - "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "lastModified": 1676177817, + "narHash": "sha256-OQnBnuKkpwkfNY31xQyfU5hNpLs1ilWt+hVY6ztEEOM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "1b82144edfcd0c86486d2e07c7298f85510e7fb8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1685347552, + "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", "type": "github" }, "original": { "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_2": { "locked": { "lastModified": 1663905476, "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", @@ -1093,8 +819,8 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -1124,10 +850,10 @@ "haskell-language-server": "haskell-language-server", "haskell-nix": "haskell-nix", "iohk-nix": "iohk-nix", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sphinxcontrib-haddock": "sphinxcontrib-haddock", - "std": "std_2" + "std": "std" } }, "sphinxcontrib-haddock": { @@ -1149,11 +875,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1667524765, - "narHash": "sha256-rY58ROG9paYqqhUPFxZArU59qOIatIFHrurhVo7JXX4=", + "lastModified": 1687306175, + "narHash": "sha256-wZzi1m5hteGQjZAhPQ+mp7T+buaV9WwHwy0sNJzPjI8=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "ed1ec5f81f9eb32eb627fd447088eb782e7ff71b", + "rev": "57f5246f08e0ebbe9f1612b67408391c81bde02e", "type": "github" }, "original": { @@ -1169,58 +895,20 @@ "dmerge": "dmerge", "flake-utils": "flake-utils_3", "makes": [ - "haskell-nix", - "tullia", "std", "blank" ], "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", "microvm": [ - "haskell-nix", - "tullia", "std", "blank" ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_4", - "yants": "yants" - }, - "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", - "owner": "divnix", - "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std_2": { - "inputs": { - "blank": "blank_2", - "devshell": "devshell_2", - "dmerge": "dmerge_2", - "flake-utils": "flake-utils_6", - "makes": [ - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", - "microvm": [ - "std", - "blank" - ], - "n2c": "n2c_2", - "nixago": "nixago_2", "nixpkgs": [ "nixpkgs" ], - "yants": "yants_2" + "yants": "yants" }, "locked": { "lastModified": 1665513321, @@ -1236,69 +924,7 @@ "type": "github" } }, - "tullia": { - "inputs": { - "nix-nomad": "nix-nomad", - "nix2container": "nix2container", - "nixpkgs": [ - "haskell-nix", - "nixpkgs" - ], - "std": "std" - }, - "locked": { - "lastModified": 1666200256, - "narHash": "sha256-cJPS8zBu30SMhxMe7I8DWutwqMuhPsEez87y9gxMKc4=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "575362c2244498e8d2c97f72861510fa72e75d44", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, - "utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "yants": { - "inputs": { - "nixpkgs": [ - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", - "owner": "divnix", - "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_2": { "inputs": { "nixpkgs": [ "std", From b2e320d60f4de37bb61adc3373594c3dfbb3a374 Mon Sep 17 00:00:00 2001 From: Konstantinos Lambrou-Latreille Date: Thu, 22 Jun 2023 08:28:06 -0400 Subject: [PATCH 02/18] WIP --- CONTRIBUTING.adoc | 33 +++++++++++++++++++ .../haskell-language-server-project.nix | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 65340a66ae..6d43815443 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -211,6 +211,39 @@ Specifically, you will probably want to say `nix flake lock --update-input Date: Thu, 27 Jul 2023 10:14:33 +0200 Subject: [PATCH 03/18] Update cardano-wallet dependency --- .../library/ghc-compiler-nix-name.nix | 2 +- cabal.project | 108 ++++++------------ flake.lock | 12 +- nix/pkgs/haskell/sha256map.nix | 6 +- 4 files changed, 46 insertions(+), 82 deletions(-) diff --git a/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix b/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix index 9c48faaa81..8cfb3d0d0e 100644 --- a/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix +++ b/__std__/cells/plutus-apps/library/ghc-compiler-nix-name.nix @@ -2,4 +2,4 @@ { inputs, cell }: -"ghc927" +"ghc928" diff --git a/cabal.project b/cabal.project index 1b5860f6b7..66fd2b21d9 100644 --- a/cabal.project +++ b/cabal.project @@ -11,12 +11,10 @@ repository cardano-haskell-packages c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56 d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee -index-state: 2023-04-20T00:00:00Z - -- See CONTRIBUTING.adoc for how to update index-state index-state: - , hackage.haskell.org 2023-04-20T00:00:00Z - , cardano-haskell-packages 2023-05-10T00:00:00Z + , hackage.haskell.org 2023-07-27T00:00:00Z + , cardano-haskell-packages 2023-07-27T00:00:00Z packages: cardano-node-emulator cardano-node-socket-emulator @@ -63,40 +61,47 @@ allow-newer: , servant-server:aeson , servant-foreign:lens , blockfrost-api:lens + -- temporary + , quickcheck-contractmodel:* constraints: + -- cardano-wallet needs + , cardano-api ^>=8.2 + , cardano-slotting >= 0.1 + , ouroboros-network ^>= 0.8.1.0 + -- cardano-prelude-0.1.0.0 needs - , protolude <0.3.1 + -- , protolude <0.3.1 -- cardano-ledger-byron-0.1.0.0 needs - , cardano-binary <1.5.0.1 + -- , cardano-binary <1.5.0.1 -- plutus-core-1.0.0.1 needs - , cardano-crypto-class >2.0.0.0 - , algebraic-graphs <0.7 + -- , cardano-crypto-class >2.0.0.0 + -- , algebraic-graphs <0.7 -- cardano-ledger-core-0.1.0.0 needs - , cardano-crypto-class <2.0.0.1 + -- , cardano-crypto-class <2.0.0.1 -- cardano-crypto-class-2.0.0.0.1 needs - , cardano-prelude <0.1.0.1 + -- , cardano-prelude <0.1.0.1 -- dbvar from cardano-wallet needs - , io-classes <0.3.0.0 + -- , io-classes <0.3.0.0 -- newer typed-protocols need io-classes>=0.3.0.0 which is incompatible with dbvar's constraint above - , typed-protocols==0.1.0.0 + -- , typed-protocols==0.1.0.0 - , aeson >= 2 + -- , aeson >= 2 - , hedgehog >= 1.1 + -- , hedgehog >= 1.1 - , resource-pool <0.4.0.0 + -- , resource-pool <0.4.0.0 - , http2 <4.0.0 + -- , http2 <4.0.0 -- ouroboros-consensus-shelley-0.1.0.1 needs - , ouroboros-consensus-protocol==0.1.0.1 + -- , ouroboros-consensus-protocol==0.1.0.1 -- The plugin will typically fail when producing Haddock documentation. However, -- in this instance you can simply tell it to defer any errors to runtime (which @@ -136,71 +141,34 @@ package cardano-wallet-launcher package cardano-wallet-core-integration optimization: False --- Direct dependency. --- Compared to others, cardano-wallet doesn't bump dependencies very often. --- Making it a good place to start when bumping dependencies. --- As, for example, bumping the node first highly risks breaking API with the wallet. --- Unless early bug fixes are required, this is fine as the wallet tracks stable releases of the node. --- And it is indeed nice for plutus-apps to track stable releases of the node too. --- --- The current version is dated 2022/08/10 source-repository-package type: git location: https://github.com/input-output-hk/cardano-wallet - tag: 18a931648550246695c790578d4a55ee2f10463e + tag: 3f0d2f3abe706958fab8cdc528184068bd0453c9 + --sha256: 1xbr5qrz716mh3vhng64m4v6zhp03x5lcf0kld5mmm1yij0fadwa subdir: - lib/cli - lib/core - lib/core-integration - lib/dbvar - lib/launcher - lib/numeric - lib/shelley - lib/strict-non-empty-containers - lib/test-utils + -- lib/balance-tx + -- lib/coin-selection + -- lib/delta-store + -- lib/delta-table + -- lib/delta-types + -- lib/launcher + -- lib/numeric + -- lib/primitive + -- lib/test-utils lib/text-class + -- lib/wai-middleware-logging + lib/wallet + -- lib/wallet-benchmarks -- Should follow cardano-wallet. source-repository-package type: git location: https://github.com/input-output-hk/cardano-addresses - tag: b7273a5d3c21f1a003595ebf1e1f79c28cd72513 + tag: 6b55f96d57a181f898eb2a50531d3ae4280c549c + --sha256: 0yygam995i3mawk6hfgxb6v918phvqzyipzhjflff0l6zfrldy7f subdir: -- cardano-addresses-cli command-line -- cardano-addresses core - --- This is needed because we rely on an unreleased branch of --- cardano-ledger-alonzo. The feature we need --- (evaluateTransactionExecutionUnitsWithLogs) in only included from --- cardano-ledger-alonzo version 1.0.0.0 --- See https://github.com/input-output-hk/cardano-ledger/pull/3111 -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-ledger - tag: da3e9ae10cf9ef0b805a046c84745f06643583c2 - subdir: - eras/alonzo/impl - eras/alonzo/test-suite - eras/babbage/impl - eras/babbage/test-suite - eras/byron/chain/executable-spec - eras/byron/crypto - eras/byron/crypto/test - eras/byron/ledger/executable-spec - eras/byron/ledger/impl - eras/byron/ledger/impl/test - eras/shelley/impl - eras/shelley/test-suite - eras/shelley-ma/impl - eras/shelley-ma/test-suite - libs/cardano-ledger-core - libs/cardano-ledger-pretty - libs/cardano-protocol-tpraos - libs/cardano-data - libs/vector-map - libs/set-algebra - libs/small-steps - libs/small-steps-test - libs/non-integral diff --git a/flake.lock b/flake.lock index f7f8dc6ad6..d53f89bcf7 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1687312611, - "narHash": "sha256-Tvq04QEK/Kkj977GM3p7KxGtOrl15ef2y6OagSS5gtM=", + "lastModified": 1690341504, + "narHash": "sha256-RWMP2yOu1/k6hUpQqn1PZ/n1e07lkiZjIGK6ZK+EAns=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "42e80e6600314053b7e0db2cb71725b9a1c8cdcf", + "rev": "21f05b352252442b483677211ad401e9458e802e", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "hackage-nix": { "flake": false, "locked": { - "lastModified": 1682036591, - "narHash": "sha256-QPrmInnsudgOP+bpJKzosItR0H1C5F54SmPLV8AlFPg=", + "lastModified": 1690331094, + "narHash": "sha256-xGJlmbRruW61N0rEcFn2pRlpLnE1TCKvvyz2nytYzE4=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "9d83fdf40d77bc15719c6e498da98dbd0714dfa4", + "rev": "efc8a53a648a6a3b0973aaefc93ace7d0ddf198d", "type": "github" }, "original": { diff --git a/nix/pkgs/haskell/sha256map.nix b/nix/pkgs/haskell/sha256map.nix index 83bcb61e30..ffcd4415b0 100644 --- a/nix/pkgs/haskell/sha256map.nix +++ b/nix/pkgs/haskell/sha256map.nix @@ -1,5 +1 @@ -{ - "https://github.com/input-output-hk/cardano-addresses"."b7273a5d3c21f1a003595ebf1e1f79c28cd72513" = "129r5kyiw10n2021bkdvnr270aiiwyq58h472d151ph0r7wpslgp"; - "https://github.com/input-output-hk/cardano-ledger"."da3e9ae10cf9ef0b805a046c84745f06643583c2" = "sha256-3VUZKkLu1R43GUk9IwgsGQ55O0rnu8NrCkFX9gqA4ck="; - "https://github.com/input-output-hk/cardano-wallet"."18a931648550246695c790578d4a55ee2f10463e" = "0i40hp1mdbljjcj4pn3n6zahblkb2jmpm8l4wnb36bya1pzf66fx"; -} +{ } From 824fdfe1ff6dad6b7c6ab23a29886ed91c16cbbd Mon Sep 17 00:00:00 2001 From: Sjoerd Visscher Date: Thu, 27 Jul 2023 10:14:50 +0200 Subject: [PATCH 04/18] change cardano-api bounds --- .../cardano-node-emulator.cabal | 2 +- .../cardano-node-socket-emulator.cabal | 2 +- cardano-streaming/cardano-streaming.cabal | 6 +++--- doc/plutus-doc.cabal | 2 +- .../plutus-chain-index-core.cabal | 4 ++-- plutus-chain-index/plutus-chain-index.cabal | 2 +- .../plutus-contract-model.cabal | 2 +- plutus-contract/plutus-contract.cabal | 4 ++-- plutus-example/plutus-example.cabal | 18 +++++++++--------- plutus-ledger/plutus-ledger.cabal | 4 ++-- .../plutus-pab-executables.cabal | 6 +++--- plutus-pab/plutus-pab.cabal | 4 ++-- plutus-script-utils/plutus-script-utils.cabal | 2 +- .../plutus-tx-constraints.cabal | 4 ++-- plutus-use-cases/plutus-use-cases.cabal | 4 ++-- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cardano-node-emulator/cardano-node-emulator.cabal b/cardano-node-emulator/cardano-node-emulator.cabal index 86a8d28ce1..47f9b4a31f 100644 --- a/cardano-node-emulator/cardano-node-emulator.cabal +++ b/cardano-node-emulator/cardano-node-emulator.cabal @@ -52,7 +52,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 , cardano-crypto , cardano-ledger-alonzo , cardano-ledger-babbage diff --git a/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal b/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal index bec2f8c4d3..ce1feed1be 100644 --- a/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal +++ b/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal @@ -48,7 +48,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-ledger-alonzo , cardano-ledger-byron , cardano-ledger-core diff --git a/cardano-streaming/cardano-streaming.cabal b/cardano-streaming/cardano-streaming.cabal index 6df3ce162d..b3ea8127a9 100644 --- a/cardano-streaming/cardano-streaming.cabal +++ b/cardano-streaming/cardano-streaming.cabal @@ -38,7 +38,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , ouroboros-network ------------------------ @@ -76,7 +76,7 @@ executable cardano-streaming-example-1 -------------------------- -- Other IOG dependencies -------------------------- - build-depends: cardano-api >=1.35 + build-depends: cardano-api ^>=8.2 ------------------------ -- Non-IOG dependencies @@ -107,7 +107,7 @@ executable cardano-streaming-example-2 -------------------------- -- Other IOG dependencies -------------------------- - build-depends: cardano-api >=1.35 + build-depends: cardano-api ^>=8.2 ------------------------ -- Non-IOG dependencies diff --git a/doc/plutus-doc.cabal b/doc/plutus-doc.cabal index 05d76c2d2e..b786c134fc 100644 --- a/doc/plutus-doc.cabal +++ b/doc/plutus-doc.cabal @@ -91,7 +91,7 @@ executable doc-doctests -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , plutus-core >=1.0.0 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 diff --git a/plutus-chain-index-core/plutus-chain-index-core.cabal b/plutus-chain-index-core/plutus-chain-index-core.cabal index 4c801c01bd..a9a6ed5f47 100644 --- a/plutus-chain-index-core/plutus-chain-index-core.cabal +++ b/plutus-chain-index-core/plutus-chain-index-core.cabal @@ -83,7 +83,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , iohk-monitoring , ouroboros-network , ouroboros-network-framework @@ -161,7 +161,7 @@ test-suite plutus-chain-index-test -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 diff --git a/plutus-chain-index/plutus-chain-index.cabal b/plutus-chain-index/plutus-chain-index.cabal index f172ef5b5f..9a14bb3eef 100644 --- a/plutus-chain-index/plutus-chain-index.cabal +++ b/plutus-chain-index/plutus-chain-index.cabal @@ -66,7 +66,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , iohk-monitoring , ouroboros-network , plutus-ledger-api >=1.0.0 diff --git a/plutus-contract-model/plutus-contract-model.cabal b/plutus-contract-model/plutus-contract-model.cabal index 550b658d22..93546a45bc 100644 --- a/plutus-contract-model/plutus-contract-model.cabal +++ b/plutus-contract-model/plutus-contract-model.cabal @@ -74,7 +74,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 , quickcheck-contractmodel >=0.1.4.0 diff --git a/plutus-contract/plutus-contract.cabal b/plutus-contract/plutus-contract.cabal index 2332d7af1c..3dcdd2aee5 100644 --- a/plutus-contract/plutus-contract.cabal +++ b/plutus-contract/plutus-contract.cabal @@ -128,7 +128,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-crypto , cardano-crypto-class , cardano-ledger-alonzo @@ -265,7 +265,7 @@ test-suite plutus-contract-test -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 , plutus-core >=1.0.0 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 diff --git a/plutus-example/plutus-example.cabal b/plutus-example/plutus-example.cabal index 1fe66e22bd..c9f8e44211 100644 --- a/plutus-example/plutus-example.cabal +++ b/plutus-example/plutus-example.cabal @@ -78,8 +78,8 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 - , cardano-cli >=1.35 + , cardano-api ^>=8.2 + , cardano-cli ^>=8.2 , cardano-ledger-alonzo , cardano-ledger-babbage , cardano-ledger-core @@ -118,7 +118,7 @@ executable plutus-example -------------------------- -- Other IOG dependencies -------------------------- - build-depends: cardano-api >=1.35 + build-depends: cardano-api ^>=8.2 ------------------------ -- Non-IOG dependencies @@ -137,7 +137,7 @@ executable create-script-context -- Local components -------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , plutus-example -------------------------- @@ -168,8 +168,8 @@ test-suite plutus-example-test -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 - , cardano-cli >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 + , cardano-cli ^>=8.2 , cardano-ledger-alonzo , cardano-ledger-core , cardano-ledger-shelley @@ -207,7 +207,7 @@ test-suite plutus-example-test ghc-options: -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T build-tool-depends: - , cardano-cli:cardano-cli >=1.35 - , cardano-node:cardano-node >=1.35 - , cardano-submit-api:cardano-submit-api >=1.35 + , cardano-cli:cardano-cli ^>=8.2 + , cardano-node:cardano-node ^>=8.2 + , cardano-submit-api:cardano-submit-api ^>=8.2 , plutus-example:create-script-context diff --git a/plutus-ledger/plutus-ledger.cabal b/plutus-ledger/plutus-ledger.cabal index 3459315f7a..2bdcd5efc6 100644 --- a/plutus-ledger/plutus-ledger.cabal +++ b/plutus-ledger/plutus-ledger.cabal @@ -114,7 +114,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-binary , cardano-crypto , cardano-crypto-class @@ -194,7 +194,7 @@ test-suite plutus-ledger-test -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 , cardano-crypto-class >=2.0.0 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 diff --git a/plutus-pab-executables/plutus-pab-executables.cabal b/plutus-pab-executables/plutus-pab-executables.cabal index 1b2f63a0a5..efe440d5e0 100644 --- a/plutus-pab-executables/plutus-pab-executables.cabal +++ b/plutus-pab-executables/plutus-pab-executables.cabal @@ -369,7 +369,7 @@ executable tx-inject -------------------------- -- Other IOG dependencies -------------------------- - build-depends: cardano-api >=1.35 + build-depends: cardano-api ^>=8.2 ------------------------ -- Non-IOG dependencies @@ -410,7 +410,7 @@ executable sync-client -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-slotting ------------------------ @@ -449,7 +449,7 @@ executable pab-cli -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-ledger-shelley , ouroboros-consensus-shelley diff --git a/plutus-pab/plutus-pab.cabal b/plutus-pab/plutus-pab.cabal index 507c570b46..3a32f72d10 100644 --- a/plutus-pab/plutus-pab.cabal +++ b/plutus-pab/plutus-pab.cabal @@ -136,7 +136,7 @@ library -------------------------- build-depends: , cardano-addresses - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-crypto , cardano-crypto-class , cardano-ledger-alonzo @@ -247,7 +247,7 @@ test-suite plutus-pab-test-light -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 diff --git a/plutus-script-utils/plutus-script-utils.cabal b/plutus-script-utils/plutus-script-utils.cabal index a5746e7952..8d1c194c11 100644 --- a/plutus-script-utils/plutus-script-utils.cabal +++ b/plutus-script-utils/plutus-script-utils.cabal @@ -84,7 +84,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , cardano-ledger-alonzo , plutus-core >=1.0.0 , plutus-ledger-api >=1.0.0 diff --git a/plutus-tx-constraints/plutus-tx-constraints.cabal b/plutus-tx-constraints/plutus-tx-constraints.cabal index 3f8c1f53f4..9c7b4ff721 100644 --- a/plutus-tx-constraints/plutus-tx-constraints.cabal +++ b/plutus-tx-constraints/plutus-tx-constraints.cabal @@ -67,7 +67,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=1.35 + , cardano-api ^>=8.2 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 @@ -106,7 +106,7 @@ test-suite plutus-tx-constraints-test -- Other IOG dependencies -------------------------- build-depends: - , cardano-api:{cardano-api, gen} >=1.35 + , cardano-api:{cardano-api, gen} ^>=8.2 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 , plutus-tx-plugin >=1.0.0 diff --git a/plutus-use-cases/plutus-use-cases.cabal b/plutus-use-cases/plutus-use-cases.cabal index bdf9a950c1..627a6fb561 100644 --- a/plutus-use-cases/plutus-use-cases.cabal +++ b/plutus-use-cases/plutus-use-cases.cabal @@ -197,7 +197,7 @@ test-suite plutus-use-cases-test -- Other IOG dependencies -------------------------- build-depends: - cardano-api >=1.35 + cardano-api ^>=8.2 , cardano-binary , cardano-ledger-alonzo , cardano-ledger-babbage @@ -297,7 +297,7 @@ executable plutus-use-cases-scripts -- Other IOG dependencies -------------------------- build-depends: - cardano-api >=1.35 + cardano-api ^>=8.2 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 From 304a2358e6eb7768dbb23bc2945a89e4bc6ea51a Mon Sep 17 00:00:00 2001 From: Sjoerd Visscher Date: Thu, 27 Jul 2023 15:42:37 +0200 Subject: [PATCH 05/18] Copy over some removed modules from plutus-core Change Plusut.Vn.Ledger to PlutusLedgerApi.Vn --- .../src/Cardano/Node/Emulator/Generators.hs | 4 ++-- .../Node/Emulator/Internal/Node/Params.hs | 2 +- .../Node/Emulator/Internal/Node/Validation.hs | 4 ++-- .../test/Cardano/Node/Emulator/GeneratorsSpec.hs | 2 +- .../test/Plutus/Example/Game.hs | 4 ++-- ...pport-inline-datums-in-constraint-library.rst | 6 +++--- doc/adr/0011-tx-validity-time-range-fix.rst | 2 +- doc/plutus/howtos/analysing-scripts.rst | 4 ++-- doc/plutus/tutorials/BasicApps.hs | 2 +- doc/plutus/tutorials/Escrow2.hs | 2 +- doc/plutus/tutorials/Escrow3.hs | 2 +- doc/plutus/tutorials/Escrow4.hs | 2 +- doc/plutus/tutorials/Escrow5.hs | 2 +- doc/plutus/tutorials/Escrow6.hs | 2 +- doc/plutus/tutorials/EscrowImpl.hs | 4 ++-- doc/plutus/tutorials/basic-apps.rst | 6 +++--- doc/plutus/tutorials/contract-models.rst | 16 ++++++++-------- .../Gen/Marconi/ChainIndex/Indexers/MintBurn.hs | 4 ++-- marconi-chain-index/test/Integration.hs | 2 +- .../Spec/Marconi/ChainIndex/Indexers/ScriptTx.hs | 2 +- .../src/Plutus/Blockfrost/Responses.hs | 12 ++++++------ pab-blockfrost/src/Plutus/Blockfrost/Utils.hs | 14 +++++++------- .../src/Plutus/ChainIndex/Api.hs | 4 ++-- .../src/Plutus/ChainIndex/ChainIndexLog.hs | 2 +- .../src/Plutus/ChainIndex/Client.hs | 2 +- .../src/Plutus/ChainIndex/DbSchema.hs | 6 +++--- .../src/Plutus/ChainIndex/Effects.hs | 4 ++-- .../src/Plutus/ChainIndex/Emulator/DiskState.hs | 2 +- .../src/Plutus/ChainIndex/Emulator/Handlers.hs | 4 ++-- .../src/Plutus/ChainIndex/Handlers.hs | 2 +- .../src/Plutus/ChainIndex/Marconi.hs | 2 +- .../src/Plutus/ChainIndex/Tx.hs | 2 +- .../src/Plutus/ChainIndex/TxIdState.hs | 2 +- .../src/Plutus/ChainIndex/Types.hs | 6 +++--- plutus-chain-index-core/test/Generators.hs | 2 +- .../Plutus/ChainIndex/Emulator/HandlersSpec.hs | 2 +- .../test/Plutus/ChainIndex/HandlersSpec.hs | 2 +- .../Contract/Test/ContractModel/Internal.hs | 2 +- plutus-contract-model/test/Spec/ErrorChecking.hs | 2 +- plutus-contract/src/Plutus/Contract/Effects.hs | 4 ++-- plutus-contract/src/Plutus/Contract/Oracle.hs | 2 +- plutus-contract/src/Plutus/Contract/Request.hs | 4 ++-- .../src/Plutus/Contract/StateMachine.hs | 2 +- .../src/Plutus/Contract/StateMachine/OnChain.hs | 6 +++--- .../Plutus/Contract/StateMachine/ThreadToken.hs | 2 +- plutus-contract/src/Plutus/Contract/Test.hs | 4 ++-- .../src/Plutus/Trace/Emulator/Extract.hs | 2 +- plutus-contract/src/Wallet/API.hs | 2 +- plutus-contract/src/Wallet/Effects.hs | 2 +- .../src/Wallet/Emulator/MultiAgent.hs | 2 +- plutus-contract/src/Wallet/Emulator/Wallet.hs | 2 +- plutus-contract/src/Wallet/Rollup.hs | 2 +- plutus-contract/src/Wallet/Rollup/Render.hs | 2 +- plutus-contract/src/Wallet/Rollup/Types.hs | 2 +- plutus-contract/test/Spec/Contract.hs | 2 +- .../Contract/Tx/Constraints/MustIncludeDatum.hs | 4 ++-- .../Spec/Contract/Tx/Constraints/MustMint.hs | 6 +++--- .../Tx/Constraints/MustPayToPubKeyAddress.hs | 2 +- .../Tx/Constraints/MustProduceAtLeast.hs | 4 ++-- .../Tx/Constraints/MustReferenceOutput.hs | 2 +- .../Contract/Tx/Constraints/MustSatisfyAnyOf.hs | 2 +- .../Contract/Tx/Constraints/MustSpendAtLeast.hs | 2 +- .../Tx/Constraints/MustSpendPubKeyOutput.hs | 2 +- .../Tx/Constraints/MustSpendScriptOutput.hs | 8 ++++---- .../Tx/Constraints/MustUseOutputAsCollateral.hs | 2 +- .../Contract/Tx/Constraints/RequiredSigner.hs | 4 ++-- .../Spec/Contract/Tx/Constraints/TimeValidity.hs | 6 +++--- .../PlutusExample/PlutusVersion1/AlwaysFails.hs | 2 +- .../PlutusVersion1/AlwaysSucceeds.hs | 2 +- .../PlutusVersion1/CustomDatumRedeemerGuess.hs | 4 ++-- .../PlutusVersion1/DatumRedeemerGuess.hs | 2 +- .../src/PlutusExample/PlutusVersion1/Loop.hs | 2 +- .../PlutusVersion1/MintingScript.hs | 2 +- .../PlutusVersion1/RedeemerContextScripts.hs | 2 +- .../src/PlutusExample/PlutusVersion1/Sum.hs | 4 ++-- .../PlutusVersion2/EcdsaSecp256k1Loop.hs | 2 +- .../PlutusVersion2/MintingScript.hs | 4 ++-- .../PlutusVersion2/RedeemerContextEquivalence.hs | 4 ++-- .../PlutusVersion2/RequireRedeemer.hs | 4 ++-- .../PlutusVersion2/SchnorrSecp256k1Loop.hs | 2 +- .../PlutusExample/PlutusVersion2/StakeScript.hs | 4 ++-- .../src/PlutusExample/ScriptContextChecker.hs | 4 ++-- plutus-example/test/Test/PlutusExample/Gen.hs | 2 +- plutus-ledger/plutus-ledger.cabal | 13 +++++++------ plutus-ledger/src/Ledger.hs | 4 ++-- plutus-ledger/src/Ledger/Address.hs | 2 +- plutus-ledger/src/Ledger/Address/Orphans.hs | 2 +- plutus-ledger/src/Ledger/Blockchain.hs | 2 +- plutus-ledger/src/Ledger/CardanoWallet.hs | 2 +- plutus-ledger/src/Ledger/Contexts/Orphans.hs | 2 +- plutus-ledger/src/Ledger/Crypto.hs | 4 ++-- plutus-ledger/src/Ledger/Crypto/Orphans.hs | 2 +- plutus-ledger/src/Ledger/Index.hs | 2 +- plutus-ledger/src/Ledger/Index/Internal.hs | 2 +- plutus-ledger/src/Ledger/Orphans.hs | 4 ++-- plutus-ledger/src/Ledger/Scripts.hs | 2 +- plutus-ledger/src/Ledger/Scripts/Orphans.hs | 2 +- plutus-ledger/src/Ledger/Test.hs | 8 ++++---- plutus-ledger/src/Ledger/Tx.hs | 10 +++++----- plutus-ledger/src/Ledger/Tx/CardanoAPI.hs | 2 +- .../src/Ledger/Tx/CardanoAPI/Internal.hs | 8 ++++---- plutus-ledger/src/Ledger/Tx/Internal.hs | 6 +++--- plutus-ledger/src/Ledger/Tx/Orphans/V1.hs | 4 ++-- plutus-ledger/src/Ledger/Tx/Orphans/V2.hs | 2 +- plutus-ledger/src/Ledger/Typed/Scripts.hs | 2 +- plutus-ledger/src/Ledger/Value/Orphans.hs | 4 ++-- .../src/Cardano/Wallet/LocalClient/ExportTx.hs | 4 ++-- plutus-pab/src/Cardano/Wallet/Mock/API.hs | 2 +- plutus-pab/src/Cardano/Wallet/Mock/Client.hs | 2 +- plutus-pab/src/Plutus/PAB/Arbitrary.hs | 4 ++-- plutus-pab/src/Plutus/PAB/Core.hs | 2 +- .../src/Plutus/PAB/Core/ContractInstance.hs | 2 +- .../PAB/Core/ContractInstance/BlockchainEnv.hs | 2 +- .../src/Plutus/PAB/Core/ContractInstance/STM.hs | 2 +- .../PAB/Core/Indexer/TxConfirmationStatus.hs | 2 +- plutus-pab/src/Plutus/PAB/Simulator.hs | 2 +- plutus-pab/src/Plutus/PAB/Webserver/Types.hs | 2 +- .../Cardano/Wallet/LocalClient/ExportTxSpec.hs | 2 +- .../src/Plutus/Script/Utils/Ada.hs | 4 ++-- .../src/Plutus/Script/Utils/Scripts.hs | 4 ++-- .../src/Plutus/Script/Utils/Typed.hs | 14 +++++++------- .../src/Plutus/Script/Utils/V1/Address.hs | 2 +- .../src/Plutus/Script/Utils/V1/Contexts.hs | 4 ++-- .../src/Plutus/Script/Utils/V1/Generators.hs | 6 +++--- .../src/Plutus/Script/Utils/V1/Scripts.hs | 4 ++-- .../src/Plutus/Script/Utils/V1/Tx.hs | 2 +- .../src/Plutus/Script/Utils/V1/Typed/Scripts.hs | 2 +- .../Utils/V1/Typed/Scripts/MonetaryPolicies.hs | 8 ++++---- .../Utils/V1/Typed/Scripts/StakeValidators.hs | 8 ++++---- .../Script/Utils/V1/Typed/Scripts/Validators.hs | 4 ++-- .../src/Plutus/Script/Utils/V2/Address.hs | 2 +- .../src/Plutus/Script/Utils/V2/Contexts.hs | 6 +++--- .../src/Plutus/Script/Utils/V2/Generators.hs | 2 +- .../src/Plutus/Script/Utils/V2/Scripts.hs | 2 +- .../src/Plutus/Script/Utils/V2/Tx.hs | 2 +- .../src/Plutus/Script/Utils/V2/Typed/Scripts.hs | 2 +- .../Utils/V2/Typed/Scripts/MonetaryPolicies.hs | 8 ++++---- .../Utils/V2/Typed/Scripts/StakeValidators.hs | 8 ++++---- .../Script/Utils/V2/Typed/Scripts/Validators.hs | 2 +- .../src/Plutus/Script/Utils/Value.hs | 2 +- .../src/Ledger/Tx/Constraints/OffChain.hs | 6 +++--- .../src/Ledger/Tx/Constraints/OnChain/V2.hs | 4 ++-- .../src/Ledger/Tx/Constraints/TxConstraints.hs | 8 ++++---- plutus-tx-constraints/test/Spec.hs | 2 +- .../src/Plutus/Contracts/Crowdfunding.hs | 4 ++-- .../src/Plutus/Contracts/Currency.hs | 4 ++-- plutus-use-cases/src/Plutus/Contracts/Escrow.hs | 6 +++--- plutus-use-cases/src/Plutus/Contracts/Future.hs | 2 +- .../src/Plutus/Contracts/Game/Alonzo.hs | 4 ++-- .../src/Plutus/Contracts/Game/Babbage.hs | 4 ++-- .../src/Plutus/Contracts/MultiSig.hs | 4 ++-- .../src/Plutus/Contracts/Prism/Credential.hs | 4 ++-- .../src/Plutus/Contracts/Prism/STO.hs | 4 ++-- plutus-use-cases/src/Plutus/Contracts/PubKey.hs | 4 ++-- .../src/Plutus/Contracts/SimpleEscrow.hs | 6 +++--- plutus-use-cases/src/Plutus/Contracts/Swap.hs | 6 +++--- .../src/Plutus/Contracts/TokenAccount.hs | 4 ++-- .../src/Plutus/Contracts/Tutorial/Escrow.hs | 4 ++-- .../Plutus/Contracts/Tutorial/EscrowStrict.hs | 6 +++--- .../src/Plutus/Contracts/Uniswap/OffChain.hs | 4 ++-- .../src/Plutus/Contracts/Uniswap/OnChain.hs | 4 ++-- plutus-use-cases/src/Plutus/Contracts/Vesting.hs | 4 ++-- plutus-use-cases/test/Spec/Currency.hs | 4 ++-- plutus-use-cases/test/Spec/Escrow/Endpoints.hs | 2 +- plutus-use-cases/test/Spec/Tutorial/Escrow.hs | 2 +- plutus-use-cases/test/Spec/Tutorial/Escrow2.hs | 2 +- plutus-use-cases/test/Spec/Tutorial/Escrow3.hs | 2 +- plutus-use-cases/test/Spec/Tutorial/Escrow4.hs | 2 +- plutus-use-cases/test/Spec/Tutorial/Escrow5.hs | 2 +- plutus-use-cases/test/Spec/Tutorial/Escrow6.hs | 2 +- plutus-use-cases/test/Spec/Uniswap/Endpoints.hs | 2 +- 171 files changed, 308 insertions(+), 307 deletions(-) diff --git a/cardano-node-emulator/src/Cardano/Node/Emulator/Generators.hs b/cardano-node-emulator/src/Cardano/Node/Emulator/Generators.hs index b5a536ef0b..f5bc953192 100644 --- a/cardano-node-emulator/src/Cardano/Node/Emulator/Generators.hs +++ b/cardano-node-emulator/src/Cardano/Node/Emulator/Generators.hs @@ -97,8 +97,8 @@ import Ledger.Tx.CardanoAPI qualified as C hiding (makeTransactionBody) import Ledger.Value.CardanoAPI qualified as Value import Numeric.Natural (Natural) import Plutus.V1.Ledger.Api qualified as V1 -import Plutus.V1.Ledger.Interval qualified as Interval -import Plutus.V1.Ledger.Scripts qualified as Script +import PlutusLedgerApi.V1.Interval qualified as Interval +import PlutusLedgerApi.V1.Scripts qualified as Script import PlutusTx (toData) -- | Attach signatures of all known private keys to a transaction. diff --git a/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Params.hs b/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Params.hs index 3efe7ab91d..ea49d651b1 100644 --- a/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Params.hs +++ b/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Params.hs @@ -56,7 +56,7 @@ import GHC.Natural (Natural) import Ledger.Test (testnet) import Ouroboros.Consensus.HardFork.History qualified as Ouroboros import Ouroboros.Consensus.Util.Counting qualified as Ouroboros -import Plutus.V1.Ledger.Api (POSIXTime (POSIXTime)) +import PlutusLedgerApi.V1 (POSIXTime (POSIXTime)) import PlutusCore (defaultCostModelParams) import Prettyprinter (Pretty (pretty), viaShow, vsep, (<+>)) diff --git a/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Validation.hs b/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Validation.hs index e2680ac009..54aec34a30 100644 --- a/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Validation.hs +++ b/cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Validation.hs @@ -72,8 +72,8 @@ import Ledger.Index.Internal qualified as P import Ledger.Slot (Slot) import Ledger.Tx (CardanoTx (CardanoEmulatorEraTx)) import Ledger.Tx.CardanoAPI qualified as P -import Plutus.V1.Ledger.Api qualified as V1 hiding (TxOut (..)) -import Plutus.V1.Ledger.Scripts qualified as P +import PlutusLedgerApi.V1 qualified as V1 hiding (TxOut (..)) +import PlutusLedgerApi.V1.Scripts qualified as P import Cardano.Node.Emulator.Internal.Node.Params (EmulatorEra, Params (emulatorPParams), emulatorGlobals, emulatorPParams) diff --git a/cardano-node-emulator/test/Cardano/Node/Emulator/GeneratorsSpec.hs b/cardano-node-emulator/test/Cardano/Node/Emulator/GeneratorsSpec.hs index 905034ecd6..ffb5b6c676 100644 --- a/cardano-node-emulator/test/Cardano/Node/Emulator/GeneratorsSpec.hs +++ b/cardano-node-emulator/test/Cardano/Node/Emulator/GeneratorsSpec.hs @@ -22,7 +22,7 @@ import Ledger qualified import Ledger.Bytes qualified as Bytes import Ledger.Interval qualified as Interval import Ledger.Value.CardanoAPI qualified as C -import Plutus.V1.Ledger.Value qualified as Value +import PlutusLedgerApi.V1.Value qualified as Value import PlutusTx.Prelude qualified as PlutusTx import Test.Tasty (TestTree, testGroup) import Test.Tasty.Hedgehog (testPropertyNamed) diff --git a/cardano-node-emulator/test/Plutus/Example/Game.hs b/cardano-node-emulator/test/Plutus/Example/Game.hs index d5c90c5640..d33b950daa 100644 --- a/cardano-node-emulator/test/Plutus/Example/Game.hs +++ b/cardano-node-emulator/test/Plutus/Example/Game.hs @@ -34,8 +34,8 @@ import Ledger.Tx.CardanoAPI qualified as C import Ledger.Typed.Scripts qualified as Scripts import Plutus.Script.Utils.Typed (ScriptContextV2, Versioned) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 -import Plutus.V2.Ledger.Api (Address, Validator) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (Address, Validator) +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx (FromData, ToData) import PlutusTx qualified import PlutusTx.Prelude () diff --git a/doc/adr/0007-support-inline-datums-in-constraint-library.rst b/doc/adr/0007-support-inline-datums-in-constraint-library.rst index f20c7d65ce..e0dcfc99ca 100644 --- a/doc/adr/0007-support-inline-datums-in-constraint-library.rst +++ b/doc/adr/0007-support-inline-datums-in-constraint-library.rst @@ -29,7 +29,7 @@ Thus, we need to adapt our transaction constraint data type (``TxConstraints``) Decision -------- -* We will replace the ``Datum`` parameter in ``TxConstraints``'s data constructor ``MustPayToPubKeyAddress`` with ``Plutus.V2.Ledger.Api.OutputDatum``. +* We will replace the ``Datum`` parameter in ``TxConstraints``'s data constructor ``MustPayToPubKeyAddress`` with ``PlutusLedgerApi.V2.OutputDatum``. In the offchain implementation of the constraint, we will use this new data constructor parameter to support either adding the datum in the datum witness set (by using the datum lookups to resolve the hash) or inline it in the transaction output. In the PlutusV1 on-chain implementation of the constraint, we will return ``False`` if the datum value matches ``OutputDatum Datum`` because the ledger forbids using Babbage era features with PlutusV1. The PlutusV2 on-chain implementation of the constraint is trivial. @@ -45,8 +45,8 @@ Argument -------- The main decision was to find out which data type will replace ``Datum`` in the interface of ``MustPayToPubKeyAddress`` and ``MustPayToOtherScript``. -The decision to use ``Plutus.V2.Ledger.Api.OutputDatum`` was mainly because of the constraint library's main design: the parameters of ``TxConstraints``'s data constructor must work with the on-chain as well as the off-chain implementation. -Therefore, we decided to use ``OutputDatum`` which we know works in on-chain code because this type is used in ``Plutus.V2.Ledger.Api.ScriptContext``. +The decision to use ``PlutusLedgerApi.V2.OutputDatum`` was mainly because of the constraint library's main design: the parameters of ``TxConstraints``'s data constructor must work with the on-chain as well as the off-chain implementation. +Therefore, we decided to use ``OutputDatum`` which we know works in on-chain code because this type is used in ``PlutusLedgerApi.V2.ScriptContext``. Notes ----- diff --git a/doc/adr/0011-tx-validity-time-range-fix.rst b/doc/adr/0011-tx-validity-time-range-fix.rst index 3058c570f7..82645924a0 100644 --- a/doc/adr/0011-tx-validity-time-range-fix.rst +++ b/doc/adr/0011-tx-validity-time-range-fix.rst @@ -42,7 +42,7 @@ Currently, provided a ``POSIXTimeRange``, ``plutus-contract`` does the following Cardano.Api.TxValidityUpperBound)`` (essentially a ``(Maybe Slot, Maybe Slot)``) The issue with these conversion is that the ``POSIXTimeRange`` and ``SlotRange`` intervals are -type synonyms of the ``Plutus.V1.Ledger.Api.Interval.Interval a`` datatype which has has a "Closure" +type synonyms of the ``PlutusLedgerApi.V1.Interval.Interval a`` datatype which has has a "Closure" flag for each of the bounds. Therefore, the conversions yields a discrepency when `cardano-ledger` converts the diff --git a/doc/plutus/howtos/analysing-scripts.rst b/doc/plutus/howtos/analysing-scripts.rst index b886b62c86..46620139d5 100644 --- a/doc/plutus/howtos/analysing-scripts.rst +++ b/doc/plutus/howtos/analysing-scripts.rst @@ -58,7 +58,7 @@ results in the following output: Writing script: ./tmp/auction_2-5.flat (Size: 9.1kB, Cost: ExCPU 1126876612, ExMemory 3408894) .. note:: - The program writes out fully applied validators by default. Fully applied validators are larger than unapplied validators because they contain not just the validator code itself but also all arguments, including the :hsobj:`Plutus.V1.Ledger.Contexts.ScriptContext`. The script context can be quite large as it is a representation of the entire transaction body. + The program writes out fully applied validators by default. Fully applied validators are larger than unapplied validators because they contain not just the validator code itself but also all arguments, including the :hsobj:`PlutusLedgerApi.V1.Contexts.ScriptContext`. The script context can be quite large as it is a representation of the entire transaction body. Running the program in the unapplied validator mode gives us a more realistic picture: @@ -84,7 +84,7 @@ Partial transactions ~~~~~~~~~~~~~~~~~~~~ .. code-block:: shell - + cabal run plutus-use-cases-scripts -- ./tmp transactions -p ./plutus-use-cases/scripts/protocol-parameters.json results in diff --git a/doc/plutus/tutorials/BasicApps.hs b/doc/plutus/tutorials/BasicApps.hs index 3cb88afa43..5d2421b718 100644 --- a/doc/plutus/tutorials/BasicApps.hs +++ b/doc/plutus/tutorials/BasicApps.hs @@ -34,7 +34,7 @@ import Plutus.Contract (Contract, Endpoint, Promise, endpoint, getParams, logInf import Plutus.Contract.Test (w1, w2) import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Trace.Emulator qualified as Trace -import Plutus.V1.Ledger.Api (Address, ScriptContext (ScriptContext, scriptContextTxInfo), TxInfo (txInfoOutputs), +import PlutusLedgerApi.V1 (Address, ScriptContext (ScriptContext, scriptContextTxInfo), TxInfo (txInfoOutputs), TxOut (TxOut, txOutAddress, txOutValue), Value) import PlutusTx qualified import PlutusTx.Prelude (Bool, Maybe (Just, Nothing), Semigroup ((<>)), mapMaybe, mconcat, ($), (&&), (-), (.), (==), diff --git a/doc/plutus/tutorials/Escrow2.hs b/doc/plutus/tutorials/Escrow2.hs index bbcf86da66..0527330a4d 100644 --- a/doc/plutus/tutorials/Escrow2.hs +++ b/doc/plutus/tutorials/Escrow2.hs @@ -29,7 +29,7 @@ import Plutus.Contract.Test (Wallet, mockWalletPaymentPubKeyHash, w1, w2, w3, w4 import Plutus.Contract.Test.ContractModel qualified as CM import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api (Datum) +import PlutusLedgerApi.V1 (Datum) import Plutus.Contracts.Tutorial.Escrow (EscrowError, EscrowParams (EscrowParams, escrowTargets), EscrowSchema, payEp, payToPaymentPubKeyTarget, redeemEp) diff --git a/doc/plutus/tutorials/Escrow3.hs b/doc/plutus/tutorials/Escrow3.hs index 25ae3e4c87..212766a939 100644 --- a/doc/plutus/tutorials/Escrow3.hs +++ b/doc/plutus/tutorials/Escrow3.hs @@ -28,7 +28,7 @@ import Plutus.Contract.Test (Wallet, mockWalletPaymentPubKeyHash, w1, w2, w3, w4 import Plutus.Contract.Test.ContractModel qualified as CM import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api (Datum) +import PlutusLedgerApi.V1 (Datum) import Plutus.Contracts.Tutorial.Escrow (EscrowError, EscrowParams (EscrowParams, escrowTargets), EscrowSchema, payEp, payToPaymentPubKeyTarget, redeemEp, refundEp) diff --git a/doc/plutus/tutorials/Escrow4.hs b/doc/plutus/tutorials/Escrow4.hs index 5f52e6ccf9..22a55c1dfc 100644 --- a/doc/plutus/tutorials/Escrow4.hs +++ b/doc/plutus/tutorials/Escrow4.hs @@ -29,7 +29,7 @@ import Plutus.Contract.Test (Wallet, mockWalletPaymentPubKeyHash, w1, w2, w3, w4 import Plutus.Contract.Test.ContractModel qualified as CM import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api (Datum) +import PlutusLedgerApi.V1 (Datum) import Plutus.Trace.Emulator qualified as Trace import PlutusTx.Monoid (inv) diff --git a/doc/plutus/tutorials/Escrow5.hs b/doc/plutus/tutorials/Escrow5.hs index 27110a8bc3..0e47cc9b3d 100644 --- a/doc/plutus/tutorials/Escrow5.hs +++ b/doc/plutus/tutorials/Escrow5.hs @@ -29,7 +29,7 @@ import Plutus.Contract.Test (Wallet, mockWalletPaymentPubKeyHash, w1, w2, w3, w4 import Plutus.Contract.Test.ContractModel qualified as CM import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api (Datum) +import PlutusLedgerApi.V1 (Datum) import Plutus.Trace.Emulator qualified as Trace import PlutusTx.Monoid (inv) diff --git a/doc/plutus/tutorials/Escrow6.hs b/doc/plutus/tutorials/Escrow6.hs index 5d6b3092ca..18ef0fade0 100644 --- a/doc/plutus/tutorials/Escrow6.hs +++ b/doc/plutus/tutorials/Escrow6.hs @@ -37,7 +37,7 @@ import Plutus.Contract.Test (Wallet, mockWalletPaymentPubKeyHash, w1, w2, w3, w4 import Plutus.Contract.Test.ContractModel qualified as CM import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api (Datum) +import PlutusLedgerApi.V1 (Datum) import Plutus.Trace.Emulator qualified as Trace import PlutusTx.Monoid (inv) diff --git a/doc/plutus/tutorials/EscrowImpl.hs b/doc/plutus/tutorials/EscrowImpl.hs index 3139e3c7c4..72f0c3ea37 100644 --- a/doc/plutus/tutorials/EscrowImpl.hs +++ b/doc/plutus/tutorials/EscrowImpl.hs @@ -66,8 +66,8 @@ import Ledger.Typed.Scripts qualified as Scripts import Plutus.Script.Utils.Scripts qualified as Scripts import Plutus.Script.Utils.V1.Scripts qualified as Scripts import Plutus.Script.Utils.Value (Value, geq, lt) -import Plutus.V1.Ledger.Api (Datum (Datum), DatumHash, ValidatorHash) -import Plutus.V1.Ledger.Contexts (ScriptContext (ScriptContext, scriptContextTxInfo), TxInfo (txInfoValidRange)) +import PlutusLedgerApi.V1 (Datum (Datum), DatumHash, ValidatorHash) +import PlutusLedgerApi.V1.Contexts (ScriptContext (ScriptContext, scriptContextTxInfo), TxInfo (txInfoValidRange)) import Cardano.Node.Emulator.Internal.Node.Params qualified as Params import Plutus.Contract (AsContractError (_ContractError), Contract, ContractError, Endpoint, HasEndpoint, Promise, diff --git a/doc/plutus/tutorials/basic-apps.rst b/doc/plutus/tutorials/basic-apps.rst index 433d47ed52..4d49f8737a 100644 --- a/doc/plutus/tutorials/basic-apps.rst +++ b/doc/plutus/tutorials/basic-apps.rst @@ -24,7 +24,7 @@ You start by defining some data types that you're going to need for the *Split* ``SplitData`` describes the two recipients of the funds, and the total amount of the funds denoted in ada. -You are using the :hsobj:`Plutus.V1.Ledger.Api.Address` type to identify the recipients. +You are using the :hsobj:`PlutusLedgerApi.V1.Address` type to identify the recipients. When making the payment you can use the hashes to create two public key outputs. Instances for data types @@ -60,13 +60,13 @@ You are going to use the validator script to lock a script output that contains In this tutorial you only need a single validator. Its datum type is ``SplitData`` and its redeemer type is ``()`` (the unit type). -The validator looks at the :hsobj:`Plutus.V1.Ledger.Api.ScriptContext` value to see if the conditions for making the payment are met: +The validator looks at the :hsobj:`PlutusLedgerApi.V1.ScriptContext` value to see if the conditions for making the payment are met: .. literalinclude:: BasicApps.hs :start-after: BLOCK2 :end-before: BLOCK3 -The validator checks that the transaction, represented by :hsobj:`Plutus.V1.Ledger.Api.scriptContextTxInfo`, pays half the specified amount to each recipient. +The validator checks that the transaction, represented by :hsobj:`PlutusLedgerApi.V1.scriptContextTxInfo`, pays half the specified amount to each recipient. You then need some boilerplate to compile the validator to a Plutus script (see `Writing basic validator scripts `_ diff --git a/doc/plutus/tutorials/contract-models.rst b/doc/plutus/tutorials/contract-models.rst index bce72a7337..a071478a72 100644 --- a/doc/plutus/tutorials/contract-models.rst +++ b/doc/plutus/tutorials/contract-models.rst @@ -440,7 +440,7 @@ framework (including wallet contents, slot number etc), but it contains the "contract state", which is the state we have defined ourselves, the ``EscrowModel``. The *lens* ``contractState . contributions . to fold`` extracts the ``EscrowModel``, extracts the -``contributions`` field from it, and then combines all the :hsobj:`Plutus.V1.Ledger.Value.Value` +``contributions`` field from it, and then combines all the :hsobj:`PlutusLedgerApi.V1.Value.Value` using |fold|_. When we apply it to ``s`` using |^.|_, we get the total value of all contributions. Likewise, the second lens application computes the combined value of all the targets. If the @@ -457,10 +457,10 @@ of :hsobj:`Plutus.Contract.Test.ContractModel.Interface.Action`, so we just add .. note:: - We can't use ``(>=)`` to compare :hsobj:`Plutus.V1.Ledger.Value.Value`; there is no - ``Ord`` instance. That is because some :hsobj:`Plutus.V1.Ledger.Value.Value` are incomparable, + We can't use ``(>=)`` to compare :hsobj:`PlutusLedgerApi.V1.Value.Value`; there is no + ``Ord`` instance. That is because some :hsobj:`PlutusLedgerApi.V1.Value.Value` are incomparable, such as one Ada and one NFT, which would break our expectations about - ``Ord``. That is why we have to compare them using :hsobj:`Plutus.V1.Ledger.Value.geq` instead. + ``Ord``. That is why we have to compare them using :hsobj:`PlutusLedgerApi.V1.Value.geq` instead. With this precondition, the failing test we have seen can no longer be generated, and will not appear again in our |quickCheck|_ runs. @@ -1212,7 +1212,7 @@ model state, :hsobj:`Plutus.Contract.Test.ContractModel.Interface.lockedValue` i that computes the total value held by contracts, and :hsobj:`Plutus.Contract.Test.ContractModel.Interface.symIsZero` checks that this is zero. The value is returned here as a :hsobj:`Test.QuickCheck.ContractModel.Internal.Symbolics.SymValue`, but for now it can be thought of just as a normal -Plutus :hsobj:`Plutus.V1.Ledger.Value.Value` with an extra type wrapper. +Plutus :hsobj:`PlutusLedgerApi.V1.Value.Value` with an extra type wrapper. This scenario just tests that the given finishing strategy always succeeds in recovering all tokens from contracts, no matter what @@ -2668,7 +2668,7 @@ test another contract, and we'll see how they reveal some surprising behaviour. The contract we take this time is the auction contract in :hsmod:`Plutus.Contracts.Auction`. This module actually defines *two* contracts, a seller contract and a buyer contract. The seller puts up -a :hsobj:`Plutus.V1.Ledger.Value.Value` for sale, creating an auction UTXO containing the value, +a :hsobj:`PlutusLedgerApi.V1.Value.Value` for sale, creating an auction UTXO containing the value, and buyers can then bid Ada for it. When the auction deadline is reached, the highest bidder receives the auctioned value, and the seller receives the bid. @@ -2907,8 +2907,8 @@ Now ``prop_Auction`` fails! .. note:: - The balance change is actually a :hsobj:`Test.QuickCheck.ContractModel.Internal.Symbolics.SymValue`, not a :hsobj:`Plutus.V1.Ledger.Value.Value`, - but as you can see it *contains* a :hsobj:`Plutus.V1.Ledger.Value.Value`, which is all we care + The balance change is actually a :hsobj:`Test.QuickCheck.ContractModel.Internal.Symbolics.SymValue`, not a :hsobj:`PlutusLedgerApi.V1.Value.Value`, + but as you can see it *contains* a :hsobj:`PlutusLedgerApi.V1.Value.Value`, which is all we care about right now. Even in this simple case, the seller does not receive the right diff --git a/marconi-chain-index/test-lib/Gen/Marconi/ChainIndex/Indexers/MintBurn.hs b/marconi-chain-index/test-lib/Gen/Marconi/ChainIndex/Indexers/MintBurn.hs index ebb9d7f1ef..ca5f3864ee 100644 --- a/marconi-chain-index/test-lib/Gen/Marconi/ChainIndex/Indexers/MintBurn.hs +++ b/marconi-chain-index/test-lib/Gen/Marconi/ChainIndex/Indexers/MintBurn.hs @@ -36,8 +36,8 @@ import Marconi.ChainIndex.Indexers.MintBurn qualified as MintBurn import Marconi.ChainIndex.Logging () import Marconi.ChainIndex.Types (SecurityParam) import Marconi.Core.Storable qualified as Storable -import Plutus.V1.Ledger.Api (MintingPolicy) -import Plutus.V1.Ledger.Api qualified as PlutusV1 +import PlutusLedgerApi.V1 (MintingPolicy) +import PlutusLedgerApi.V1 qualified as PlutusV1 import PlutusTx qualified -- | The workhorse of the test: generate an indexer, then generate diff --git a/marconi-chain-index/test/Integration.hs b/marconi-chain-index/test/Integration.hs index 96899f5464..ee14d3576d 100644 --- a/marconi-chain-index/test/Integration.hs +++ b/marconi-chain-index/test/Integration.hs @@ -41,7 +41,7 @@ import Cardano.BM.Trace (logError) import Cardano.BM.Tracing (defaultConfigStdout) import Cardano.Streaming (ChainSyncEventException (NoIntersectionFound), withChainSyncEventStream) import Gen.Cardano.Api.Typed qualified as CGen -import Plutus.V1.Ledger.Scripts qualified as Plutus +import PlutusLedgerApi.V1.Scripts qualified as Plutus import PlutusTx qualified import Prettyprinter (defaultLayoutOptions, layoutPretty, pretty, (<+>)) import Prettyprinter.Render.Text (renderStrict) diff --git a/marconi-chain-index/test/Spec/Marconi/ChainIndex/Indexers/ScriptTx.hs b/marconi-chain-index/test/Spec/Marconi/ChainIndex/Indexers/ScriptTx.hs index 557a8eb558..0978c969ba 100644 --- a/marconi-chain-index/test/Spec/Marconi/ChainIndex/Indexers/ScriptTx.hs +++ b/marconi-chain-index/test/Spec/Marconi/ChainIndex/Indexers/ScriptTx.hs @@ -49,7 +49,7 @@ import Marconi.ChainIndex.Indexers qualified as M import Marconi.ChainIndex.Indexers.ScriptTx qualified as ScriptTx import Marconi.ChainIndex.Logging () import Marconi.Core.Storable qualified as Storable -import Plutus.V1.Ledger.Scripts qualified as Plutus +import PlutusLedgerApi.V1.Scripts qualified as Plutus import PlutusTx qualified import Prettyprinter (defaultLayoutOptions, layoutPretty, pretty, (<+>)) import Prettyprinter.Render.Text (renderStrict) diff --git a/pab-blockfrost/src/Plutus/Blockfrost/Responses.hs b/pab-blockfrost/src/Plutus/Blockfrost/Responses.hs index e009bd6aa8..b6d0288606 100644 --- a/pab-blockfrost/src/Plutus/Blockfrost/Responses.hs +++ b/pab-blockfrost/src/Plutus/Blockfrost/Responses.hs @@ -38,10 +38,10 @@ import Ledger.Tx (DatumFromQuery (DatumUnknown), DecoratedTxOut (..), Language ( import Plutus.ChainIndex.Api (IsUtxoResponse (..), QueryResponse (..), TxosResponse (..), UtxosResponse (..)) import Plutus.ChainIndex.Types (BlockId (..), BlockNumber (..), ChainIndexTx (..), ChainIndexTxOutputs (..), Tip (..)) import Plutus.V1.Ledger.Api (PubKeyHash) -import Plutus.V1.Ledger.Credential (Credential (PubKeyCredential, ScriptCredential)) -import Plutus.V1.Ledger.Scripts (Datum, MintingPolicy, StakeValidator, Validator (..), ValidatorHash (..)) -import Plutus.V1.Ledger.Scripts qualified as Ledger (DatumHash, Script, ScriptHash (..)) -import Plutus.V1.Ledger.Tx qualified +import PlutusLedgerApi.V1.Credential (Credential (PubKeyCredential, ScriptCredential)) +import PlutusLedgerApi.V1.Scripts (Datum, MintingPolicy, StakeValidator, Validator (..), ValidatorHash (..)) +import PlutusLedgerApi.V1.Scripts qualified as Ledger (DatumHash, Script, ScriptHash (..)) +import PlutusLedgerApi.V1.Tx qualified import PlutusTx qualified @@ -50,7 +50,7 @@ import Control.Monad ((<=<)) import Plutus.Blockfrost.Types import Plutus.Blockfrost.Utils import Plutus.ChainIndex.Types qualified as CI -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V2 qualified as PV2 class FromJSON a => PlutusValidator a where @@ -257,7 +257,7 @@ processGetTxFromTxId (Just TxResponse{..}) = do datElems <- sequence newElems return $ fromList $ zip newKeys datElems - getAllRedeemersMap :: Map Integer (ValidationPurpose, ScriptDatum) -> IO Plutus.V1.Ledger.Tx.Redeemers + getAllRedeemersMap :: Map Integer (ValidationPurpose, ScriptDatum) -> IO PlutusLedgerApi.V1.Tx.Redeemers getAllRedeemersMap datumMap = do let indexs = keys datumMap st = map (toPlutusScriptTag . fst) (elems datumMap) diff --git a/pab-blockfrost/src/Plutus/Blockfrost/Utils.hs b/pab-blockfrost/src/Plutus/Blockfrost/Utils.hs index 150f58b1df..e57dfd3a0b 100644 --- a/pab-blockfrost/src/Plutus/Blockfrost/Utils.hs +++ b/pab-blockfrost/src/Plutus/Blockfrost/Utils.hs @@ -25,11 +25,11 @@ import Ledger.Value.CardanoAPI qualified as Value import Money (Approximation (Round), DecimalConf (..), SomeDiscrete, UnitScale, defaultDecimalConf, discreteToDecimal, scale, someDiscreteAmount, someDiscreteCurrency) import Plutus.V1.Ledger.Address qualified as LA -import Plutus.V1.Ledger.Api (Credential (..), TxId (TxId), fromBuiltin, toBuiltin, unCurrencySymbol, unTokenName) -import Plutus.V1.Ledger.Api qualified (DatumHash, RedeemerHash) -import Plutus.V1.Ledger.Interval (always, from, interval, to) -import Plutus.V1.Ledger.Scripts qualified as PS -import Plutus.V1.Ledger.Value (AssetClass, unAssetClass) +import PlutusLedgerApi.V1 (Credential (..), TxId (TxId), fromBuiltin, toBuiltin, unCurrencySymbol, unTokenName) +import PlutusLedgerApi.V1 qualified (DatumHash, RedeemerHash) +import PlutusLedgerApi.V1.Interval (always, from, interval, to) +import PlutusLedgerApi.V1.Scripts qualified as PS +import PlutusLedgerApi.V1.Value (AssetClass, unAssetClass) class Show a => ToBlockfrostScriptHash a where @@ -44,8 +44,8 @@ class Show a => ToBlockfrostDatumHash a where toBlockfrostDatumHash :: a -> Blockfrost.DatumHash toBlockfrostDatumHash = fromString . show -instance ToBlockfrostDatumHash Plutus.V1.Ledger.Api.DatumHash -instance ToBlockfrostDatumHash Plutus.V1.Ledger.Api.RedeemerHash +instance ToBlockfrostDatumHash PlutusLedgerApi.V1.DatumHash +instance ToBlockfrostDatumHash PlutusLedgerApi.V1.RedeemerHash toBlockfrostTxHash :: TxId -> TxHash toBlockfrostTxHash = TxHash . pack . show diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Api.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Api.hs index 6aff85bfd7..61a80a44ba 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Api.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Api.hs @@ -36,11 +36,11 @@ import Ledger.Credential (Credential) import Ledger.Tx (DatumFromQuery, DecoratedTxOut, TxOutRef, Versioned) import Plutus.ChainIndex.Tx (ChainIndexTx) import Plutus.ChainIndex.Types (Diagnostics, Tip) -import Plutus.V1.Ledger.Api (Datum, DatumHash, MintingPolicy (MintingPolicy), MintingPolicyHash (MintingPolicyHash), +import PlutusLedgerApi.V1 (Datum, DatumHash, MintingPolicy (MintingPolicy), MintingPolicyHash (MintingPolicyHash), PubKeyHash, Redeemer, RedeemerHash (RedeemerHash), StakeValidator (StakeValidator), StakeValidatorHash (StakeValidatorHash), StakingCredential, TxId, Validator, ValidatorHash (ValidatorHash)) -import Plutus.V1.Ledger.Value (AssetClass (AssetClass)) +import PlutusLedgerApi.V1.Value (AssetClass (AssetClass)) import Servant qualified import Servant.API (Description, Get, JSON, NoContent, Post, Put, ReqBody, (:<|>), (:>)) import Servant.OpenApi (toOpenApi) diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/ChainIndexLog.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/ChainIndexLog.hs index 5e92f99c85..e9dffae23b 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/ChainIndexLog.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/ChainIndexLog.hs @@ -13,7 +13,7 @@ import Plutus.ChainIndex.ChainIndexError (ChainIndexError) import Plutus.ChainIndex.Tx (ChainIndexTxOut) import Plutus.ChainIndex.Types (Tip (..)) import Plutus.Contract.CardanoAPI (FromCardanoError (..)) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) import Prettyprinter (Pretty (..), colon, viaShow, (<+>)) data ChainIndexLog = diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Client.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Client.hs index 46b241109e..b826e25efc 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Client.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Client.hs @@ -41,7 +41,7 @@ import Plutus.ChainIndex.Api (API, IsUtxoResponse, QueryAtAddressRequest (QueryA import Plutus.ChainIndex.Effects (ChainIndexQueryEffect (..)) import Plutus.ChainIndex.Tx (ChainIndexTx) import Plutus.ChainIndex.Types (Tip) -import Plutus.V1.Ledger.Api (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, +import PlutusLedgerApi.V1 (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, StakeValidatorHash, TxId, Validator, ValidatorHash) import Servant (NoContent, (:<|>) (..)) import Servant.Client (ClientEnv, ClientError (..), ClientM, client, runClientM) diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/DbSchema.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/DbSchema.hs index 30347c83ba..4495fe5eae 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/DbSchema.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/DbSchema.hs @@ -42,11 +42,11 @@ import Plutus.ChainIndex.Tx (ChainIndexTx) import Plutus.ChainIndex.Tx qualified as CI import Plutus.ChainIndex.Types (BlockNumber (..), Tip (..)) -import Plutus.V1.Ledger.Api (Credential, Datum, DatumHash (..), MintingPolicy, MintingPolicyHash (..), Redeemer, +import PlutusLedgerApi.V1 (Credential, Datum, DatumHash (..), MintingPolicy, MintingPolicyHash (..), Redeemer, RedeemerHash (..), Script, StakeValidator, StakeValidatorHash (..), TxId (..), TxOutRef (..), Validator, ValidatorHash (..)) -import Plutus.V1.Ledger.Scripts (ScriptHash (..)) -import Plutus.V1.Ledger.Value (AssetClass) +import PlutusLedgerApi.V1.Scripts (ScriptHash (..)) +import PlutusLedgerApi.V1.Value (AssetClass) import PlutusTx.Builtins qualified as PlutusTx import PlutusTx.Builtins.Internal (BuiltinByteString (..), emptyByteString) diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Effects.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Effects.hs index 5649a7d454..7ce8092781 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Effects.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Effects.hs @@ -38,9 +38,9 @@ import Ledger.Tx (DecoratedTxOut, TxOutRef, Versioned) import Plutus.ChainIndex.Api (IsUtxoResponse, QueryResponse, TxosResponse, UtxosResponse) import Plutus.ChainIndex.Tx (ChainIndexTx) import Plutus.ChainIndex.Types (ChainSyncBlock, Diagnostics, Point, Tip) -import Plutus.V1.Ledger.Api (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, +import PlutusLedgerApi.V1 (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, StakeValidatorHash, TxId, Validator, ValidatorHash) -import Plutus.V1.Ledger.Value (AssetClass) +import PlutusLedgerApi.V1.Value (AssetClass) data ChainIndexQueryEffect r where diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/DiskState.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/DiskState.hs index a4829218cb..4aaee8820a 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/DiskState.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/DiskState.hs @@ -40,7 +40,7 @@ import Ledger.Tx (Versioned) import Plutus.ChainIndex.Tx (ChainIndexTx, ChainIndexTxOut (..), citxData, citxScripts, citxTxId, txOutsWithRef, txRedeemersWithHash) import Plutus.ChainIndex.Types (Diagnostics (..)) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) -- | Set of transaction output references for each address. newtype CredentialMap = CredentialMap { _unCredentialMap :: Map Credential (Set TxOutRef) } diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/Handlers.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/Handlers.hs index 8f01cd7fc0..1e8dc39710 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/Handlers.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/Handlers.hs @@ -57,11 +57,11 @@ import Plutus.ChainIndex.Types (ChainIndexTx, ChainIndexTxOut (..), ChainSyncBlo import Plutus.ChainIndex.UtxoState (InsertUtxoSuccess (..), RollbackResult (..), UtxoIndex, tip, utxoState) import Plutus.ChainIndex.UtxoState qualified as UtxoState import Plutus.Script.Utils.Scripts (datumHash) -import Plutus.V1.Ledger.Api (Credential (PubKeyCredential, ScriptCredential), Datum, DatumHash, +import PlutusLedgerApi.V1 (Credential (PubKeyCredential, ScriptCredential), Datum, DatumHash, MintingPolicy (MintingPolicy), MintingPolicyHash (MintingPolicyHash), Script, StakeValidator (StakeValidator), StakeValidatorHash (StakeValidatorHash), TxId, Validator (Validator), ValidatorHash (ValidatorHash)) -import Plutus.V2.Ledger.Api (OutputDatum (..)) +import PlutusLedgerApi.V2 (OutputDatum (..)) data ChainIndexEmulatorState = ChainIndexEmulatorState diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Handlers.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Handlers.hs index dffd4cdecc..bc59669a36 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Handlers.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Handlers.hs @@ -66,7 +66,7 @@ import Plutus.ChainIndex.UtxoState qualified as UtxoState import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Scripts (datumHash) import Plutus.Script.Utils.Value (AssetClass (AssetClass), flattenValue) -import Plutus.V2.Ledger.Api (Credential (..), TxId) +import PlutusLedgerApi.V2 (Credential (..), TxId) import PlutusTx.Builtins.Internal (emptyByteString) type ChainIndexState = UtxoIndex TxUtxoBalance diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Marconi.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Marconi.hs index 783dd27dd4..4cee880ad2 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Marconi.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Marconi.hs @@ -42,7 +42,7 @@ import Plutus.ChainIndex.Effects (ChainIndexControlEffect (AppendBlocks), ChainI import Plutus.ChainIndex.Types (ChainSyncBlock (..), Tip (TipAtGenesis), citxCardanoTx, tipAsPoint) import Plutus.Contract.CardanoAPI (fromCardanoTxId) import Plutus.Monitoring.Util (PrettyObject (PrettyObject), convertLog, runLogEffects) -import Plutus.V2.Ledger.Api (TxOutRef (TxOutRef)) +import PlutusLedgerApi.V2 (TxOutRef (TxOutRef)) {- Handling ChainIndexEffects with Marconi - Developer notes: diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Tx.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Tx.hs index 1ab304365d..a0ba8f015b 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Tx.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Tx.hs @@ -49,7 +49,7 @@ import Ledger.Scripts (Redeemer, RedeemerHash) import Plutus.ChainIndex.Types import Plutus.Contract.CardanoAPI (fromCardanoTx) import Plutus.Script.Utils.Scripts (redeemerHash) -import Plutus.V2.Ledger.Api (Address (..), OutputDatum (..), Value (..)) +import PlutusLedgerApi.V2 (Address (..), OutputDatum (..), Value (..)) -- | Get tx outputs from tx. txOuts :: ChainIndexTx -> [ChainIndexTxOut] diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/TxIdState.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/TxIdState.hs index 594d890f1c..e030128fbd 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/TxIdState.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/TxIdState.hs @@ -27,7 +27,7 @@ import Plutus.ChainIndex.Types (BlockNumber (..), Depth (..), Point (..), Rollba TxConfirmedState (..), TxIdState (..), TxStatus, TxStatusFailure (..), TxValidity (..)) import Plutus.ChainIndex.UtxoState (RollbackFailed (..), RollbackResult (..), UtxoIndex, UtxoState (..), rollbackWith, tip, utxoState, viewTip) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) -- | The 'TxStatus' of a transaction right after it was added to the chain initialStatus :: OnChainTx -> TxStatus diff --git a/plutus-chain-index-core/src/Plutus/ChainIndex/Types.hs b/plutus-chain-index-core/src/Plutus/ChainIndex/Types.hs index 53366fc8a9..d8f2203516 100644 --- a/plutus-chain-index-core/src/Plutus/ChainIndex/Types.hs +++ b/plutus-chain-index-core/src/Plutus/ChainIndex/Types.hs @@ -96,9 +96,9 @@ import Ledger.Blockchain (BlockId (..)) import Ledger.Blockchain qualified as Ledger import Ledger.Slot (Slot (Slot)) import Ledger.Tx.CardanoAPI (fromCardanoScriptInAnyLang) -import Plutus.V1.Ledger.Scripts (Datum (Datum), DatumHash (DatumHash), Script, ScriptHash (..)) -import Plutus.V1.Ledger.Tx (RedeemerPtr, Redeemers, ScriptTag, TxId (TxId)) -import Plutus.V2.Ledger.Api (CurrencySymbol (CurrencySymbol), Extended, Interval (..), LowerBound, OutputDatum (..), +import PlutusLedgerApi.V1.Scripts (Datum (Datum), DatumHash (DatumHash), Script, ScriptHash (..)) +import PlutusLedgerApi.V1.Tx (RedeemerPtr, Redeemers, ScriptTag, TxId (TxId)) +import PlutusLedgerApi.V2 (CurrencySymbol (CurrencySymbol), Extended, Interval (..), LowerBound, OutputDatum (..), Redeemer (Redeemer), TokenName (TokenName), UpperBound, Validator (Validator), Value (..)) import PlutusCore.Data import PlutusTx.AssocMap qualified as AssocMap diff --git a/plutus-chain-index-core/test/Generators.hs b/plutus-chain-index-core/test/Generators.hs index 412f2a95ea..b1d5ed7a7c 100644 --- a/plutus-chain-index-core/test/Generators.hs +++ b/plutus-chain-index-core/test/Generators.hs @@ -63,7 +63,7 @@ import Plutus.ChainIndex.TxOutBalance qualified as TxOutBalance import Plutus.ChainIndex.TxUtxoBalance qualified as TxUtxoBalance import Plutus.ChainIndex.Types (BlockId (BlockId), BlockNumber (BlockNumber), Tip (Tip, tipBlockId, tipBlockNo, tipSlot), TxIdState, TxOutBalance, TxUtxoBalance) -import Plutus.V1.Ledger.Api (TxId (..)) +import PlutusLedgerApi.V1 (TxId (..)) import PlutusTx.Prelude qualified as PlutusTx -- | Generate a random tx id diff --git a/plutus-chain-index-core/test/Plutus/ChainIndex/Emulator/HandlersSpec.hs b/plutus-chain-index-core/test/Plutus/ChainIndex/Emulator/HandlersSpec.hs index 8a66585923..d8568037d1 100644 --- a/plutus-chain-index-core/test/Plutus/ChainIndex/Emulator/HandlersSpec.hs +++ b/plutus-chain-index-core/test/Plutus/ChainIndex/Emulator/HandlersSpec.hs @@ -28,7 +28,7 @@ import Plutus.ChainIndex.ChainIndexError (ChainIndexError) import Plutus.ChainIndex.Effects (ChainIndexControlEffect, ChainIndexQueryEffect, getTip) import Plutus.ChainIndex.Emulator.Handlers (ChainIndexEmulatorState, handleControl, handleQuery) import Plutus.ChainIndex.Tx (ChainIndexTxOut (citoValue), txOuts) -import Plutus.V1.Ledger.Value (AssetClass (AssetClass)) +import PlutusLedgerApi.V1.Value (AssetClass (AssetClass)) import Hedgehog (Property, assert, forAll, property, (===)) import Ledger.Tx.CardanoAPI (fromCardanoAssetId) diff --git a/plutus-chain-index-core/test/Plutus/ChainIndex/HandlersSpec.hs b/plutus-chain-index-core/test/Plutus/ChainIndex/HandlersSpec.hs index 331b193789..24cc1a9da5 100644 --- a/plutus-chain-index-core/test/Plutus/ChainIndex/HandlersSpec.hs +++ b/plutus-chain-index-core/test/Plutus/ChainIndex/HandlersSpec.hs @@ -34,7 +34,7 @@ import Plutus.ChainIndex.Api (UtxosResponse (UtxosResponse), isUtxo) import Plutus.ChainIndex.DbSchema (checkedSqliteDb) import Plutus.ChainIndex.Effects (ChainIndexControlEffect, ChainIndexQueryEffect, getTip) import Plutus.Script.Utils.Ada qualified as Ada -import Plutus.V1.Ledger.Value (AssetClass (AssetClass)) +import PlutusLedgerApi.V1.Value (AssetClass (AssetClass)) import Test.Tasty (TestTree, testGroup) import Test.Tasty.Hedgehog (testPropertyNamed) import Util (utxoSetFromBlockAddrs) diff --git a/plutus-contract-model/src/Plutus/Contract/Test/ContractModel/Internal.hs b/plutus-contract-model/src/Plutus/Contract/Test/ContractModel/Internal.hs index 81818cb413..67f44f3cc0 100644 --- a/plutus-contract-model/src/Plutus/Contract/Test/ContractModel/Internal.hs +++ b/plutus-contract-model/src/Plutus/Contract/Test/ContractModel/Internal.hs @@ -78,7 +78,7 @@ import Plutus.Contract.Test hiding (not) import Plutus.Trace.Effects.EmulatorControl (EmulatorControl, discardWallets) import Plutus.Trace.Emulator as Trace (BaseEmulatorEffects, EmulatorEffects, EmulatorTrace, activateContract, freezeContractInstance, waitNSlots) -import Plutus.V1.Ledger.Crypto +import PlutusLedgerApi.V1.Crypto import PlutusTx.Builtins qualified as Builtins import PlutusTx.Coverage hiding (_coverageIndex) import PlutusTx.ErrorCodes diff --git a/plutus-contract-model/test/Spec/ErrorChecking.hs b/plutus-contract-model/test/Spec/ErrorChecking.hs index 253d0c3544..34f9e6815f 100644 --- a/plutus-contract-model/test/Spec/ErrorChecking.hs +++ b/plutus-contract-model/test/Spec/ErrorChecking.hs @@ -29,7 +29,7 @@ import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.V1.Scripts (validatorHash) import Plutus.Script.Utils.V1.Typed.Scripts.Validators hiding (validatorHash) import Plutus.Trace.Emulator as Trace -import Plutus.V1.Ledger.Api (Datum (Datum), ScriptContext) +import PlutusLedgerApi.V1 (Datum (Datum), ScriptContext) import PlutusTx qualified import PlutusTx.IsData.Class import PlutusTx.Prelude hiding ((<$)) diff --git a/plutus-contract/src/Plutus/Contract/Effects.hs b/plutus-contract/src/Plutus/Contract/Effects.hs index 2d170f7fa5..08a3731113 100644 --- a/plutus-contract/src/Plutus/Contract/Effects.hs +++ b/plutus-contract/src/Plutus/Contract/Effects.hs @@ -109,9 +109,9 @@ import Plutus.ChainIndex.Api (IsUtxoResponse (IsUtxoResponse), QueryResponse (Qu TxosResponse (TxosResponse), UtxosResponse (UtxosResponse)) import Plutus.ChainIndex.Tx (ChainIndexTx (_citxTxId)) import Plutus.ChainIndex.Types (Tip, TxOutStatus, TxStatus) -import Plutus.V1.Ledger.Api (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, +import PlutusLedgerApi.V1 (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, StakeValidatorHash, TxId, TxOutRef, ValidatorHash) -import Plutus.V1.Ledger.Value (AssetClass) +import PlutusLedgerApi.V1.Value (AssetClass) import Prettyprinter (Pretty (pretty), hsep, indent, viaShow, vsep, (<+>)) import Wallet.Error (WalletAPIError) import Wallet.Types (ContractInstanceId, EndpointDescription, EndpointValue) diff --git a/plutus-contract/src/Plutus/Contract/Oracle.hs b/plutus-contract/src/Plutus/Contract/Oracle.hs index 425f2432ed..f2008ecbc5 100644 --- a/plutus-contract/src/Plutus/Contract/Oracle.hs +++ b/plutus-contract/src/Plutus/Contract/Oracle.hs @@ -70,7 +70,7 @@ import Ledger.Tx.Constraints.OnChain.V2 qualified as Constraints import Plutus.Script.Utils.Scripts qualified as Scripts import Plutus.V1.Ledger.Bytes (LedgerBytes (LedgerBytes)) import Plutus.V1.Ledger.Time (POSIXTime) -import Plutus.V2.Ledger.Contexts (ScriptContext) +import PlutusLedgerApi.V2.Contexts (ScriptContext) import Prelude qualified as Haskell diff --git a/plutus-contract/src/Plutus/Contract/Request.hs b/plutus-contract/src/Plutus/Contract/Request.hs index 57dc52e064..c79d335015 100644 --- a/plutus-contract/src/Plutus/Contract/Request.hs +++ b/plutus-contract/src/Plutus/Contract/Request.hs @@ -160,9 +160,9 @@ import Plutus.Contract.Schema (Input, Output) import Plutus.Contract.Types (Contract (Contract), MatchingError (WrongVariantError), Promise (Promise), mapError, runError, throwError) import Plutus.Contract.Util (loopM) -import Plutus.V1.Ledger.Api (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, +import PlutusLedgerApi.V1 (Datum, DatumHash, MintingPolicy, MintingPolicyHash, Redeemer, RedeemerHash, StakeValidator, StakeValidatorHash, TxId, Validator) -import Plutus.V1.Ledger.Value (AssetClass) +import PlutusLedgerApi.V1.Value (AssetClass) import PlutusTx qualified import Wallet.Emulator.Error (WalletAPIError (NoPaymentPubKeyHashError)) import Wallet.Types (ContractInstanceId, EndpointDescription (EndpointDescription), diff --git a/plutus-contract/src/Plutus/Contract/StateMachine.hs b/plutus-contract/src/Plutus/Contract/StateMachine.hs index 9974ae572d..76978f21e0 100644 --- a/plutus-contract/src/Plutus/Contract/StateMachine.hs +++ b/plutus-contract/src/Plutus/Contract/StateMachine.hs @@ -88,7 +88,7 @@ import Plutus.Script.Utils.V2.Scripts (scriptCurrencySymbol) import Plutus.Script.Utils.V2.Typed.Scripts qualified as Typed import Plutus.Script.Utils.Value (Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Tx qualified as V2 +import PlutusLedgerApi.V2.Tx qualified as V2 import PlutusTx qualified import PlutusTx.Monoid (inv) diff --git a/plutus-contract/src/Plutus/Contract/StateMachine/OnChain.hs b/plutus-contract/src/Plutus/Contract/StateMachine/OnChain.hs index 4cfa975c2d..5c45474bc9 100644 --- a/plutus-contract/src/Plutus/Contract/StateMachine/OnChain.hs +++ b/plutus-contract/src/Plutus/Contract/StateMachine/OnChain.hs @@ -35,9 +35,9 @@ import Ledger.Tx.Constraints.OnChain.V2 (checkScriptContext) import Ledger.Typed.Scripts (DatumType, RedeemerType, ValidatorTypes, validatorCardanoAddress, validatorHash) import Plutus.Script.Utils.V2.Typed.Scripts (TypedValidator, ValidatorType) import Plutus.Script.Utils.Value (Value, isZero) -import Plutus.V2.Ledger.Api (ValidatorHash) -import Plutus.V2.Ledger.Contexts (ScriptContext, TxInInfo (txInInfoResolved), findOwnInput, ownHash) -import Plutus.V2.Ledger.Tx qualified as PV2 +import PlutusLedgerApi.V2 (ValidatorHash) +import PlutusLedgerApi.V2.Contexts (ScriptContext, TxInInfo (txInInfoResolved), findOwnInput, ownHash) +import PlutusLedgerApi.V2.Tx qualified as PV2 import PlutusTx qualified import PlutusTx.Prelude hiding (check) import Prelude qualified as Haskell diff --git a/plutus-contract/src/Plutus/Contract/StateMachine/ThreadToken.hs b/plutus-contract/src/Plutus/Contract/StateMachine/ThreadToken.hs index 8260fb4890..e65dcb47be 100644 --- a/plutus-contract/src/Plutus/Contract/StateMachine/ThreadToken.hs +++ b/plutus-contract/src/Plutus/Contract/StateMachine/ThreadToken.hs @@ -27,7 +27,7 @@ import Plutus.Contract.StateMachine.MintingPolarity (MintingPolarity (..)) import Plutus.Script.Utils.Typed (ScriptContextV2, mkUntypedMintingPolicy) import Plutus.Script.Utils.Value (CurrencySymbol, TokenName (..), Value (..)) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import Prelude qualified as Haskell diff --git a/plutus-contract/src/Plutus/Contract/Test.hs b/plutus-contract/src/Plutus/Contract/Test.hs index 35092943f1..1dd0632f21 100644 --- a/plutus-contract/src/Plutus/Contract/Test.hs +++ b/plutus-contract/src/Plutus/Contract/Test.hs @@ -138,8 +138,8 @@ import Plutus.Contract.Types (Contract (..), IsContract (..), ResumableResult, s import Plutus.Trace.Emulator (EmulatorConfig (..), EmulatorTrace, params, runEmulatorStream) import Plutus.Trace.Emulator.Types (ContractConstraints, ContractInstanceLog, ContractInstanceState (..), ContractInstanceTag, UserThreadMsg) -import Plutus.V1.Ledger.Scripts qualified as PV1 -import Plutus.V1.Ledger.Value qualified as Plutus +import PlutusLedgerApi.V1.Scripts qualified as PV1 +import PlutusLedgerApi.V1.Value qualified as Plutus import PlutusTx (CompiledCode, FromData (..), getPir) import PlutusTx.Coverage import Streaming qualified as S diff --git a/plutus-contract/src/Plutus/Trace/Emulator/Extract.hs b/plutus-contract/src/Plutus/Trace/Emulator/Extract.hs index 0540f501db..67d2dd7176 100644 --- a/plutus-contract/src/Plutus/Trace/Emulator/Extract.hs +++ b/plutus-contract/src/Plutus/Trace/Emulator/Extract.hs @@ -29,7 +29,7 @@ import Ledger.Tx.Constraints.OffChain (UnbalancedTx (..)) import Plutus.Contract.Request (MkTxLog) import Plutus.Trace.Emulator (EmulatorConfig (_params), EmulatorTrace) import Plutus.Trace.Emulator qualified as Trace -import Plutus.V1.Ledger.Api (ExBudget (..)) +import PlutusLedgerApi.V1 (ExBudget (..)) import Prettyprinter (Pretty (..)) import Streaming.Prelude qualified as S import System.Directory (createDirectoryIfMissing) diff --git a/plutus-contract/src/Wallet/API.hs b/plutus-contract/src/Wallet/API.hs index 7eec683b21..750bad9c08 100644 --- a/plutus-contract/src/Wallet/API.hs +++ b/plutus-contract/src/Wallet/API.hs @@ -77,7 +77,7 @@ import Ledger (Address, CardanoTx, Interval (Interval, ivFrom, ivTo), PaymentPub import Ledger.Tx.Constraints qualified as Constraints import Ledger.Tx.Constraints.OffChain (adjustUnbalancedTx) import Ledger.Tx.Constraints.ValidityInterval qualified as Interval -import Plutus.V1.Ledger.Value (Value) +import PlutusLedgerApi.V1.Value (Value) import Wallet.Effects (NodeClientEffect, WalletEffect, balanceTx, getClientParams, getClientSlot, ownAddresses, publishTx, submitTxn, walletAddSignature, yieldUnbalancedTx) import Wallet.Emulator.LogMessages (RequestHandlerLogMsg (AdjustingUnbalancedTx)) diff --git a/plutus-contract/src/Wallet/Effects.hs b/plutus-contract/src/Wallet/Effects.hs index ff96c96a4c..29ed723dae 100644 --- a/plutus-contract/src/Wallet/Effects.hs +++ b/plutus-contract/src/Wallet/Effects.hs @@ -31,7 +31,7 @@ import Control.Monad.Freer.TH (makeEffect) import Data.List.NonEmpty (NonEmpty) import Ledger (CardanoAddress, CardanoTx, Slot) import Ledger.Tx.Constraints.OffChain (UnbalancedTx) -import Plutus.V1.Ledger.Value (Value) +import PlutusLedgerApi.V1.Value (Value) import Wallet.Error (WalletAPIError) {-# DEPRECATED TotalFunds "We won't use the wallet for querying blockchain information. See https://plutus-apps.readthedocs.io/en/latest/adr/0005-pab-indexing-solution-integration.html" #-} diff --git a/plutus-contract/src/Wallet/Emulator/MultiAgent.hs b/plutus-contract/src/Wallet/Emulator/MultiAgent.hs index 94352141dc..ae6a6cbfc0 100644 --- a/plutus-contract/src/Wallet/Emulator/MultiAgent.hs +++ b/plutus-contract/src/Wallet/Emulator/MultiAgent.hs @@ -57,7 +57,7 @@ import Plutus.ChainIndex.Effects qualified as ChainIndex (ChainIndexControlEffec import Plutus.ChainIndex.Emulator.Handlers qualified as ChainIndex (handleControl, handleQuery) import Plutus.Trace.Emulator.Types (ContractInstanceLog, EmulatedWalletEffects, EmulatedWalletEffects', UserThreadMsg) import Plutus.Trace.Scheduler qualified as Scheduler -import Plutus.V1.Ledger.Scripts qualified as Script +import PlutusLedgerApi.V1.Scripts qualified as Script import PlutusTx (toData) import Prettyprinter (Pretty (pretty), colon, (<+>)) import Wallet.API qualified as WAPI diff --git a/plutus-contract/src/Wallet/Emulator/Wallet.hs b/plutus-contract/src/Wallet/Emulator/Wallet.hs index e90c48874e..32bbeb9425 100644 --- a/plutus-contract/src/Wallet/Emulator/Wallet.hs +++ b/plutus-contract/src/Wallet/Emulator/Wallet.hs @@ -66,7 +66,7 @@ import Plutus.ChainIndex qualified as ChainIndex import Plutus.ChainIndex.Api (collectQueryResponse) import Plutus.ChainIndex.Emulator (ChainIndexEmulatorState, ChainIndexQueryEffect) import Plutus.Contract.Checkpoint (CheckpointLogMsg) -import Plutus.V1.Ledger.Api (ValidatorHash, Value) +import PlutusLedgerApi.V1 (ValidatorHash, Value) import Prettyprinter (Pretty (pretty)) import Servant.API (FromHttpApiData (parseUrlPiece), ToHttpApiData (toUrlPiece)) import Wallet.Effects (NodeClientEffect, diff --git a/plutus-contract/src/Wallet/Rollup.hs b/plutus-contract/src/Wallet/Rollup.hs index 1152d30750..4e08eafabc 100644 --- a/plutus-contract/src/Wallet/Rollup.hs +++ b/plutus-contract/src/Wallet/Rollup.hs @@ -27,7 +27,7 @@ import Ledger (Block, Blockchain, OnChainTx (..), TxOut, consumableInputs, onCha import Ledger.Index (genesisTxIn, toOnChain) import Ledger.Tx qualified as Tx import Ledger.Tx.CardanoAPI (fromCardanoValue) -import Plutus.V1.Ledger.Value (Value) +import PlutusLedgerApi.V1.Value (Value) import Wallet.Rollup.Types ------------------------------------------------------------ diff --git a/plutus-contract/src/Wallet/Rollup/Render.hs b/plutus-contract/src/Wallet/Rollup/Render.hs index 58bed3f189..dd638b73d6 100644 --- a/plutus-contract/src/Wallet/Rollup/Render.hs +++ b/plutus-contract/src/Wallet/Rollup/Render.hs @@ -44,7 +44,7 @@ import Plutus.Script.Utils.Ada (Ada (Lovelace)) import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value (CurrencySymbol (CurrencySymbol), TokenName (TokenName), Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Api (TxId) +import PlutusLedgerApi.V2 (TxId) import PlutusTx qualified import PlutusTx.AssocMap qualified as AssocMap import PlutusTx.Prelude qualified as PlutusTx diff --git a/plutus-contract/src/Wallet/Rollup/Types.hs b/plutus-contract/src/Wallet/Rollup/Types.hs index 74e1452173..106aca09fc 100644 --- a/plutus-contract/src/Wallet/Rollup/Types.hs +++ b/plutus-contract/src/Wallet/Rollup/Types.hs @@ -15,7 +15,7 @@ import Data.Aeson (FromJSON, FromJSONKey, ToJSON, ToJSONKey) import Data.Map (Map) import GHC.Generics import Ledger (CardanoTx, PaymentPubKeyHash (PaymentPubKeyHash), TxOut, cardanoAddressCredential, txOutAddress) -import Plutus.V1.Ledger.Api (Credential (PubKeyCredential, ScriptCredential), ValidatorHash, Value) +import PlutusLedgerApi.V1 (Credential (PubKeyCredential, ScriptCredential), ValidatorHash, Value) data SequenceId = SequenceId diff --git a/plutus-contract/test/Spec/Contract.hs b/plutus-contract/test/Spec/Contract.hs index 9469f71bd4..dbfd2cbb5c 100644 --- a/plutus-contract/test/Spec/Contract.hs +++ b/plutus-contract/test/Spec/Contract.hs @@ -45,7 +45,7 @@ import Plutus.Trace.Emulator.Types (ContractInstanceLog (_cilMessage), ContractInstanceMsg (ContractLog, CurrentRequests, HandledRequest, ReceiveEndpointCall, Started, StoppedNoError), ContractInstanceState (ContractInstanceState, instContractState), UserThreadMsg (UserLog)) -import Plutus.V1.Ledger.Api (Validator) +import PlutusLedgerApi.V1 (Validator) import PlutusTx qualified import Prelude hiding (not) import Wallet.Emulator qualified as EM diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustIncludeDatum.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustIncludeDatum.hs index bff378528b..22c3f7c4b1 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustIncludeDatum.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustIncludeDatum.hs @@ -25,10 +25,10 @@ import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Typed qualified as Typed import Plutus.Script.Utils.V1.Scripts qualified as PSU.V1 import Plutus.Trace qualified as Trace -import Plutus.V1.Ledger.Api (CurrencySymbol (CurrencySymbol), Datum (Datum), Redeemer (Redeemer), +import PlutusLedgerApi.V1 (CurrencySymbol (CurrencySymbol), Datum (Datum), Redeemer (Redeemer), ScriptContext (scriptContextTxInfo), ToData (toBuiltinData), TxInfo (txInfoData), UnsafeFromData (unsafeFromBuiltinData), Validator, ValidatorHash) -import Plutus.V1.Ledger.Value qualified as Value +import PlutusLedgerApi.V1.Value qualified as Value import PlutusTx qualified import PlutusTx.Prelude qualified as P diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustMint.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustMint.hs index 24c99fd079..0bf3dbb128 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustMint.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustMint.hs @@ -43,9 +43,9 @@ import Plutus.Script.Utils.V2.Scripts qualified as PSU.V2 import Plutus.Script.Utils.V2.Typed.Scripts qualified as PV2 import Plutus.Script.Utils.Value (TokenName (TokenName)) import Plutus.Trace qualified as Trace -import Plutus.V1.Ledger.Api (Address, MintingPolicyHash (MintingPolicyHash), Redeemer, TxOutRef) -import Plutus.V1.Ledger.Value qualified as Value -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1 (Address, MintingPolicyHash (MintingPolicyHash), Redeemer, TxOutRef) +import PlutusLedgerApi.V1.Value qualified as Value +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import Prelude hiding (not) diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustPayToPubKeyAddress.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustPayToPubKeyAddress.hs index 313f4dc241..dcfdd49a2a 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustPayToPubKeyAddress.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustPayToPubKeyAddress.hs @@ -29,7 +29,7 @@ import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.V1.Scripts qualified as PSU.V1 import Plutus.Script.Utils.V2.Scripts qualified as PSU.V2 import Plutus.Trace qualified as Trace -import Plutus.V1.Ledger.Value qualified as Value +import PlutusLedgerApi.V1.Value qualified as Value import PlutusTx qualified import PlutusTx.Prelude qualified as P diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustProduceAtLeast.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustProduceAtLeast.hs index 6a88a9d6fa..cfc11e990f 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustProduceAtLeast.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustProduceAtLeast.hs @@ -29,8 +29,8 @@ import Plutus.Contract.Test (assertContractError, assertEvaluationError, assertV changeInitialWalletValue, checkPredicateOptions, defaultCheckOptions, mockWalletAddress, w1, w6, (.&&.)) import Plutus.Trace qualified as Trace -import Plutus.V1.Ledger.Api (Datum (Datum), ScriptContext) -import Plutus.V1.Ledger.Value qualified as Plutus +import PlutusLedgerApi.V1 (Datum (Datum), ScriptContext) +import PlutusLedgerApi.V1.Value qualified as Plutus import PlutusTx qualified import PlutusTx.Prelude qualified as P import Prelude hiding (not) diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustReferenceOutput.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustReferenceOutput.hs index f94f5009f1..18370f6a46 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustReferenceOutput.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustReferenceOutput.hs @@ -44,7 +44,7 @@ import Plutus.Script.Utils.Typed (Any) import Plutus.Script.Utils.V2.Address qualified as PSU.V2 import Plutus.Script.Utils.V2.Scripts qualified as PSU.V2 import Plutus.Trace qualified as Trace -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import PlutusTx.Prelude qualified as P import Spec.Contract.Error (cardanoLedgerErrorContaining) diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSatisfyAnyOf.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSatisfyAnyOf.hs index 7998eaf728..d3e8c742c8 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSatisfyAnyOf.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSatisfyAnyOf.hs @@ -48,7 +48,7 @@ import Plutus.Script.Utils.V1.Generators (alwaysSucceedPolicyVersioned, someToke import Plutus.Script.Utils.V1.Scripts qualified as PSU.V1 import Plutus.Script.Utils.V2.Scripts qualified as PSU.V2 import Plutus.Trace.Emulator qualified as Trace (EmulatorTrace, activateContractWallet, params, waitNSlots) -import Plutus.V1.Ledger.Value +import PlutusLedgerApi.V1.Value import PlutusTx qualified import PlutusTx.Prelude qualified as P diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendAtLeast.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendAtLeast.hs index cb475907a1..19e3faf536 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendAtLeast.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendAtLeast.hs @@ -25,7 +25,7 @@ import Plutus.Contract.Test (assertContractError, assertEvaluationError, assertV import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Typed qualified as Typed import Plutus.Trace.Emulator qualified as Trace (EmulatorTrace, activateContractWallet, nextSlot, walletInstanceTag) -import Plutus.V1.Ledger.Api (Datum (Datum), ScriptContext, ValidatorHash) +import PlutusLedgerApi.V1 (Datum (Datum), ScriptContext, ValidatorHash) import PlutusTx qualified import PlutusTx.Prelude qualified as P import Prelude hiding (not) diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendPubKeyOutput.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendPubKeyOutput.hs index b3feba2537..a6d80591db 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendPubKeyOutput.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendPubKeyOutput.hs @@ -35,7 +35,7 @@ import Plutus.Contract.Test (assertContractError, assertEvaluationError, assertV import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Typed qualified as Typed import Plutus.Trace qualified as Trace -import Plutus.V1.Ledger.Api (Datum (Datum), ScriptContext, TxOutRef (TxOutRef), Validator, ValidatorHash) +import PlutusLedgerApi.V1 (Datum (Datum), ScriptContext, TxOutRef (TxOutRef), Validator, ValidatorHash) import PlutusTx qualified import PlutusTx.Prelude qualified as P import Wallet.Emulator.Wallet as Wallet (WalletState, chainIndexEmulatorState, ownAddress, signPrivateKeys, diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendScriptOutput.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendScriptOutput.hs index d04653e2a2..17f5463266 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendScriptOutput.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustSpendScriptOutput.hs @@ -61,10 +61,10 @@ import Plutus.Script.Utils.V1.Typed.Scripts as PSU.V1 import Plutus.Script.Utils.V2.Address qualified as PSU.V2 import Plutus.Script.Utils.V2.Scripts qualified as PSU.V2 import Plutus.Trace qualified as Trace -import Plutus.V1.Ledger.Api qualified as PV1 -import Plutus.V1.Ledger.Scripts (ScriptError, unitRedeemer) -import Plutus.V1.Ledger.Value qualified as V -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1 qualified as PV1 +import PlutusLedgerApi.V1.Scripts (ScriptError, unitRedeemer) +import PlutusLedgerApi.V1.Value qualified as V +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import PlutusTx.Prelude qualified as P import Wallet.Emulator.Wallet (mockWalletAddress) diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustUseOutputAsCollateral.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustUseOutputAsCollateral.hs index d739838108..6df7c1f319 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/MustUseOutputAsCollateral.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/MustUseOutputAsCollateral.hs @@ -43,7 +43,7 @@ import Plutus.Script.Utils.V1.Scripts qualified as PSU.V1 import Plutus.Script.Utils.V2.Scripts qualified as PSU.V2 import Plutus.Trace.Emulator qualified as Trace (EmulatorTrace, activateContractWallet, nextSlot, params, setSigningProcess, walletInstanceTag) -import Plutus.V1.Ledger.Value qualified as Value +import PlutusLedgerApi.V1.Value qualified as Value import PlutusTx qualified import PlutusTx.Prelude qualified as P import Wallet.Emulator.Wallet as Wallet (signPrivateKeys, walletToMockWallet') diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/RequiredSigner.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/RequiredSigner.hs index 1ac4093722..d6f5650088 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/RequiredSigner.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/RequiredSigner.hs @@ -26,8 +26,8 @@ import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Typed qualified as Scripts import Plutus.Script.Utils.V2.Typed.Scripts qualified as Scripts import Plutus.Trace.Emulator qualified as Trace (activateContractWallet, nextSlot, setSigningProcess) -import Plutus.V1.Ledger.Scripts (unitDatum) -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1.Scripts (unitDatum) +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import Prelude import Spec.Contract.Error (cardanoLedgerErrorContaining) diff --git a/plutus-contract/test/Spec/Contract/Tx/Constraints/TimeValidity.hs b/plutus-contract/test/Spec/Contract/Tx/Constraints/TimeValidity.hs index db8ea5813c..6906fdd520 100644 --- a/plutus-contract/test/Spec/Contract/Tx/Constraints/TimeValidity.hs +++ b/plutus-contract/test/Spec/Contract/Tx/Constraints/TimeValidity.hs @@ -30,9 +30,9 @@ import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Trace qualified as Trace import Plutus.V1.Ledger.Api (POSIXTime, TxInfo, Validator) import Plutus.V1.Ledger.Api qualified as P -import Plutus.V1.Ledger.Interval (contains, from) -import Plutus.V1.Ledger.Interval qualified as I -import Plutus.V1.Ledger.Scripts (unitDatum, unitRedeemer) +import PlutusLedgerApi.V1.Interval (contains, from) +import PlutusLedgerApi.V1.Interval qualified as I +import PlutusLedgerApi.V1.Scripts (unitDatum, unitRedeemer) import PlutusTx qualified import PlutusTx.Prelude qualified as P import Prelude hiding (not) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysFails.hs b/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysFails.hs index b3549e4e9b..0a40fda7ad 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysFails.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysFails.hs @@ -15,7 +15,7 @@ import Codec.Serialise import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS -import Plutus.V1.Ledger.Scripts qualified as Plutus +import PlutusLedgerApi.V1.Scripts qualified as Plutus import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysSucceeds.hs b/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysSucceeds.hs index 42202caf1e..914eba7b93 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysSucceeds.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/AlwaysSucceeds.hs @@ -15,7 +15,7 @@ import Codec.Serialise import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS -import Plutus.V1.Ledger.Api qualified as Plutus +import PlutusLedgerApi.V1 qualified as Plutus import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/CustomDatumRedeemerGuess.hs b/plutus-example/src/PlutusExample/PlutusVersion1/CustomDatumRedeemerGuess.hs index 8009c5451b..bc8390ad2f 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/CustomDatumRedeemerGuess.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/CustomDatumRedeemerGuess.hs @@ -20,8 +20,8 @@ import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed qualified as Scripts -import Plutus.V1.Ledger.Api qualified as Plutus -import Plutus.V1.Ledger.Contexts (ScriptContext) +import PlutusLedgerApi.V1 qualified as Plutus +import PlutusLedgerApi.V1.Contexts (ScriptContext) import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup ((<>)), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/DatumRedeemerGuess.hs b/plutus-example/src/PlutusExample/PlutusVersion1/DatumRedeemerGuess.hs index 72f266f339..b5b4c1d8ac 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/DatumRedeemerGuess.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/DatumRedeemerGuess.hs @@ -18,7 +18,7 @@ import Codec.Serialise import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS -import Plutus.V1.Ledger.Api qualified as Plutus +import PlutusLedgerApi.V1 qualified as Plutus import PlutusTx (toBuiltinData) import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/Loop.hs b/plutus-example/src/PlutusExample/PlutusVersion1/Loop.hs index 0b3de840ab..d27925d7c8 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/Loop.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/Loop.hs @@ -17,7 +17,7 @@ import Codec.Serialise import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS -import Plutus.V1.Ledger.Scripts qualified as Plutus +import PlutusLedgerApi.V1.Scripts qualified as Plutus import PlutusTx import PlutusTx.Builtins (unsafeDataAsI) import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/MintingScript.hs b/plutus-example/src/PlutusExample/PlutusVersion1/MintingScript.hs index b9793dcbe2..f4cb89f132 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/MintingScript.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/MintingScript.hs @@ -19,7 +19,7 @@ import Data.ByteString.Lazy qualified as LB import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed qualified as Scripts -import Plutus.V1.Ledger.Api (MintingPolicy, Script, ScriptContext, Validator (Validator), mkMintingPolicyScript, +import PlutusLedgerApi.V1 (MintingPolicy, Script, ScriptContext, Validator (Validator), mkMintingPolicyScript, unMintingPolicyScript) import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/RedeemerContextScripts.hs b/plutus-example/src/PlutusExample/PlutusVersion1/RedeemerContextScripts.hs index 0da2375da7..9b1ab9ad5d 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/RedeemerContextScripts.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/RedeemerContextScripts.hs @@ -28,7 +28,7 @@ import Data.ByteString.Lazy qualified as LB import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed as Scripts -import Plutus.V1.Ledger.Api qualified as Plutus +import PlutusLedgerApi.V1 qualified as Plutus import PlutusTx qualified import PlutusTx.AssocMap qualified as AMap import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion1/Sum.hs b/plutus-example/src/PlutusExample/PlutusVersion1/Sum.hs index 47ed5f8542..7938819d5d 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion1/Sum.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion1/Sum.hs @@ -20,8 +20,8 @@ import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed qualified as Scripts -import Plutus.V1.Ledger.Api (ScriptContext) -import Plutus.V1.Ledger.Scripts qualified as Plutus +import PlutusLedgerApi.V1 (ScriptContext) +import PlutusLedgerApi.V1.Scripts qualified as Plutus import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion2/EcdsaSecp256k1Loop.hs b/plutus-example/src/PlutusExample/PlutusVersion2/EcdsaSecp256k1Loop.hs index 75f6210775..8b2283573a 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion2/EcdsaSecp256k1Loop.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion2/EcdsaSecp256k1Loop.hs @@ -14,7 +14,7 @@ import Cardano.Api.Shelley (PlutusScript (..)) import Codec.Serialise (serialise) import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS -import Plutus.V2.Ledger.Api qualified as PlutusV2 +import PlutusLedgerApi.V2 qualified as PlutusV2 import PlutusTx qualified import PlutusTx.Builtins qualified as BI import PlutusTx.Prelude as P hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion2/MintingScript.hs b/plutus-example/src/PlutusExample/PlutusVersion2/MintingScript.hs index a176f6d4cd..4765f54d9c 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion2/MintingScript.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion2/MintingScript.hs @@ -20,8 +20,8 @@ import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed as Scripts -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Contexts as V2 +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Contexts as V2 import PlutusTx qualified import PlutusTx.Builtins import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion2/RedeemerContextEquivalence.hs b/plutus-example/src/PlutusExample/PlutusVersion2/RedeemerContextEquivalence.hs index dd7ab7efed..23b87f1175 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion2/RedeemerContextEquivalence.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion2/RedeemerContextEquivalence.hs @@ -24,8 +24,8 @@ import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed as Scripts -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Contexts as V2 +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Contexts as V2 import PlutusTx qualified import PlutusTx.Prelude as PlutusPrelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion2/RequireRedeemer.hs b/plutus-example/src/PlutusExample/PlutusVersion2/RequireRedeemer.hs index d064405ff6..5a36ececd4 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion2/RequireRedeemer.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion2/RequireRedeemer.hs @@ -15,8 +15,8 @@ import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed as Scripts -import Plutus.V2.Ledger.Api qualified as Plutus -import Plutus.V2.Ledger.Contexts as V2 +import PlutusLedgerApi.V2 qualified as Plutus +import PlutusLedgerApi.V2.Contexts as V2 import PlutusTx qualified import PlutusTx.Builtins import PlutusTx.Eq as PlutusTx diff --git a/plutus-example/src/PlutusExample/PlutusVersion2/SchnorrSecp256k1Loop.hs b/plutus-example/src/PlutusExample/PlutusVersion2/SchnorrSecp256k1Loop.hs index 8ab4b373ff..eaac744940 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion2/SchnorrSecp256k1Loop.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion2/SchnorrSecp256k1Loop.hs @@ -14,7 +14,7 @@ import Cardano.Api.Shelley (PlutusScript (..)) import Codec.Serialise (serialise) import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS -import Plutus.V2.Ledger.Api qualified as PlutusV2 +import PlutusLedgerApi.V2 qualified as PlutusV2 import PlutusTx qualified import PlutusTx.Builtins qualified as BI import PlutusTx.Prelude as P hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/PlutusVersion2/StakeScript.hs b/plutus-example/src/PlutusExample/PlutusVersion2/StakeScript.hs index 2d8eedbbd5..9b4c73826c 100644 --- a/plutus-example/src/PlutusExample/PlutusVersion2/StakeScript.hs +++ b/plutus-example/src/PlutusExample/PlutusVersion2/StakeScript.hs @@ -20,8 +20,8 @@ import Data.ByteString.Lazy qualified as LBS import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Typed as Scripts -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Contexts as V2 +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Contexts as V2 import PlutusTx qualified import PlutusTx.Builtins import PlutusTx.Prelude hiding (Semigroup (..), unless, (.)) diff --git a/plutus-example/src/PlutusExample/ScriptContextChecker.hs b/plutus-example/src/PlutusExample/ScriptContextChecker.hs index 46b394d6fc..313149edfc 100644 --- a/plutus-example/src/PlutusExample/ScriptContextChecker.hs +++ b/plutus-example/src/PlutusExample/ScriptContextChecker.hs @@ -49,8 +49,8 @@ import Control.Monad.Trans.Except import Ouroboros.Consensus.HardFork.Combinator.AcrossEras qualified as Consensus import Ouroboros.Consensus.HardFork.History qualified as Consensus -import Plutus.V1.Ledger.Api qualified as V1 -import Plutus.V2.Ledger.Api qualified as V2 +import PlutusLedgerApi.V1 qualified as V1 +import PlutusLedgerApi.V2 qualified as V2 import PlutusTx.AssocMap qualified as PMap import PlutusTx.Prelude as PPrelude hiding (Eq, Semigroup (..), unless, (.)) diff --git a/plutus-example/test/Test/PlutusExample/Gen.hs b/plutus-example/test/Test/PlutusExample/Gen.hs index 9ca32233eb..92d5fadb0e 100644 --- a/plutus-example/test/Test/PlutusExample/Gen.hs +++ b/plutus-example/test/Test/PlutusExample/Gen.hs @@ -16,7 +16,7 @@ import Cardano.Ledger.Shelley.UTxO qualified as Ledger import Cardano.Ledger.TxIn qualified as Ledger import Gen.Cardano.Api.Typed import Ledger qualified as Plutus -import Plutus.V1.Ledger.Tx qualified as PV1 +import PlutusLedgerApi.V1.Tx qualified as PV1 import PlutusExample.PlutusVersion1.RedeemerContextScripts import PlutusExample.ScriptContextChecker diff --git a/plutus-ledger/plutus-ledger.cabal b/plutus-ledger/plutus-ledger.cabal index 2bdcd5efc6..46576aa274 100644 --- a/plutus-ledger/plutus-ledger.cabal +++ b/plutus-ledger/plutus-ledger.cabal @@ -92,15 +92,15 @@ library Prettyprinter.Extras reexported-modules: - Plutus.V1.Ledger.Bytes as Ledger.Bytes, - Plutus.V1.Ledger.Credential as Ledger.Credential, - Plutus.V1.Ledger.DCert as Ledger.DCert, - Plutus.V1.Ledger.Interval as Ledger.Interval, - Plutus.V1.Ledger.Time as Ledger.Time, + PlutusLedgerApi.V1.Bytes as Ledger.Bytes, + PlutusLedgerApi.V1.Credential as Ledger.Credential, + PlutusLedgerApi.V1.DCert as Ledger.DCert, + PlutusLedgerApi.V1.Interval as Ledger.Interval, + PlutusLedgerApi.V1.Time as Ledger.Time, -- The rest of the plutus-ledger-api modules are reexported from within -- the Haskell modules and not in the current cabal file. - -- For example: Plutus.V1.Ledger.Address is reexported by Ledger.Address + -- For example: PlutusLedgerApi.V1.Address is reexported by Ledger.Address other-modules: Codec.CBOR.Extras Ledger.Tx.CardanoAPITemp @@ -166,6 +166,7 @@ library , transformers , vector + -- , quickcheck-contractmodel >=0.1.4.0 ghc-options: -fprint-potential-instances if !(impl(ghcjs) || os(ghcjs)) diff --git a/plutus-ledger/src/Ledger.hs b/plutus-ledger/src/Ledger.hs index 81e5b26b87..2b58258578 100644 --- a/plutus-ledger/src/Ledger.hs +++ b/plutus-ledger/src/Ledger.hs @@ -19,5 +19,5 @@ import Ledger.Value.CardanoAPI as Export hiding (singleton) import Plutus.V1.Ledger.Api (Credential, DCert) import Plutus.V1.Ledger.Contexts as Export hiding (TxId (..), TxOut (..)) import Plutus.V1.Ledger.Credential (StakingCredential) -import Plutus.V1.Ledger.Interval as Export -import Plutus.V1.Ledger.Time as Export +import PlutusLedgerApi.V1.Interval as Export +import PlutusLedgerApi.V1.Time as Export diff --git a/plutus-ledger/src/Ledger/Address.hs b/plutus-ledger/src/Ledger/Address.hs index 98dd270250..1d9c266e3f 100644 --- a/plutus-ledger/src/Ledger/Address.hs +++ b/plutus-ledger/src/Ledger/Address.hs @@ -48,7 +48,7 @@ import Ledger.Scripts (Language (..), StakeValidatorHash (..), Validator, Valida import Plutus.Script.Utils.V1.Address qualified as PV1 import Plutus.Script.Utils.V2.Address qualified as PV2 import Plutus.V1.Ledger.Address as Export hiding (pubKeyHashAddress) -import Plutus.V1.Ledger.Credential (Credential (PubKeyCredential, ScriptCredential), StakingCredential (StakingHash)) +import PlutusLedgerApi.V1.Credential (Credential (PubKeyCredential, ScriptCredential), StakingCredential (StakingHash)) import PlutusTx qualified import PlutusTx.Lift (makeLift) import PlutusTx.Prelude qualified as PlutusTx diff --git a/plutus-ledger/src/Ledger/Address/Orphans.hs b/plutus-ledger/src/Ledger/Address/Orphans.hs index 4f7fac612d..17f224a023 100644 --- a/plutus-ledger/src/Ledger/Address/Orphans.hs +++ b/plutus-ledger/src/Ledger/Address/Orphans.hs @@ -8,7 +8,7 @@ import Data.Aeson (FromJSON, ToJSON) import Ledger.Credential.Orphans () import Ledger.Scripts.Orphans () -import Plutus.V1.Ledger.Address +import PlutusLedgerApi.V1.Address deriving anyclass instance ToJSON Address deriving anyclass instance FromJSON Address diff --git a/plutus-ledger/src/Ledger/Blockchain.hs b/plutus-ledger/src/Ledger/Blockchain.hs index 4a38b1d2db..f8682b9e3d 100644 --- a/plutus-ledger/src/Ledger/Blockchain.hs +++ b/plutus-ledger/src/Ledger/Blockchain.hs @@ -32,7 +32,7 @@ import Cardano.Api qualified as C import Ledger.Index.Internal (OnChainTx (..), eitherTx, unOnChain) import Ledger.Tx (TxOut, getCardanoTxCollateralInputs, getCardanoTxInputs, getCardanoTxProducedOutputs, getCardanoTxProducedReturnCollateral) -import Plutus.V1.Ledger.Scripts +import PlutusLedgerApi.V1.Scripts -- | Block identifier (usually a hash) newtype BlockId = BlockId { getBlockId :: BS.ByteString } diff --git a/plutus-ledger/src/Ledger/CardanoWallet.hs b/plutus-ledger/src/Ledger/CardanoWallet.hs index f29d59d00c..50faae43dc 100644 --- a/plutus-ledger/src/Ledger/CardanoWallet.hs +++ b/plutus-ledger/src/Ledger/CardanoWallet.hs @@ -56,7 +56,7 @@ import Ledger.Crypto qualified as Crypto import Ledger.Test (testnet) import Ledger.Tx.CardanoAPI.Internal qualified as Tx import Plutus.V1.Ledger.Api (Address (Address), Credential (PubKeyCredential), StakingCredential (StakingHash)) -import Plutus.V1.Ledger.Bytes (LedgerBytes (getLedgerBytes)) +import PlutusLedgerApi.V1.Bytes (LedgerBytes (getLedgerBytes)) import Servant.API (FromHttpApiData, ToHttpApiData) newtype MockPrivateKey = MockPrivateKey { unMockPrivateKey :: Crypto.XPrv } diff --git a/plutus-ledger/src/Ledger/Contexts/Orphans.hs b/plutus-ledger/src/Ledger/Contexts/Orphans.hs index 2deec015ca..57c3f63488 100644 --- a/plutus-ledger/src/Ledger/Contexts/Orphans.hs +++ b/plutus-ledger/src/Ledger/Contexts/Orphans.hs @@ -4,6 +4,6 @@ {-# LANGUAGE DerivingStrategies #-} module Ledger.Contexts.Orphans where -import Plutus.V1.Ledger.Contexts (ScriptPurpose (..)) +import PlutusLedgerApi.V1.Contexts (ScriptPurpose (..)) deriving stock instance Ord ScriptPurpose diff --git a/plutus-ledger/src/Ledger/Crypto.hs b/plutus-ledger/src/Ledger/Crypto.hs index ee3fd6cc00..ee8ec04ab0 100644 --- a/plutus-ledger/src/Ledger/Crypto.hs +++ b/plutus-ledger/src/Ledger/Crypto.hs @@ -40,8 +40,8 @@ import Data.String import GHC.Generics (Generic) import Ledger.Tx.Orphans.V1 () import Plutus.V1.Ledger.Api (LedgerBytes (LedgerBytes), TxId (TxId), fromBuiltin, toBuiltin) -import Plutus.V1.Ledger.Bytes qualified as KB -import Plutus.V1.Ledger.Crypto as Export +import PlutusLedgerApi.V1.Bytes qualified as KB +import PlutusLedgerApi.V1.Crypto as Export import PlutusTx qualified as PlutusTx import PlutusTx.Lift (makeLift) import PlutusTx.Prelude qualified as PlutusTx diff --git a/plutus-ledger/src/Ledger/Crypto/Orphans.hs b/plutus-ledger/src/Ledger/Crypto/Orphans.hs index 08dd8be5e2..5c1aceca26 100644 --- a/plutus-ledger/src/Ledger/Crypto/Orphans.hs +++ b/plutus-ledger/src/Ledger/Crypto/Orphans.hs @@ -10,7 +10,7 @@ import Control.Newtype.Generics (Newtype) import Data.Aeson (FromJSON, FromJSONKey, ToJSON, ToJSONKey) import Data.Hashable (Hashable) -import Plutus.V1.Ledger.Crypto +import PlutusLedgerApi.V1.Crypto deriving anyclass instance ToJSON PubKeyHash deriving anyclass instance FromJSON PubKeyHash diff --git a/plutus-ledger/src/Ledger/Index.hs b/plutus-ledger/src/Ledger/Index.hs index b53ff8f61e..21d5d38074 100644 --- a/plutus-ledger/src/Ledger/Index.hs +++ b/plutus-ledger/src/Ledger/Index.hs @@ -72,7 +72,7 @@ import Ledger.Tx.Internal qualified as Tx import Ledger.Value.CardanoAPI (Value, lovelaceToValue) import Plutus.Script.Utils.Ada (Ada) import Plutus.Script.Utils.Ada qualified as Ada -import Plutus.V1.Ledger.Api qualified as PV1 +import PlutusLedgerApi.V1 qualified as PV1 import PlutusTx.Lattice ((\/)) -- | Create an index of all UTxOs on the chain. diff --git a/plutus-ledger/src/Ledger/Index/Internal.hs b/plutus-ledger/src/Ledger/Index/Internal.hs index 4edd49b5a6..bc0be5e80a 100644 --- a/plutus-ledger/src/Ledger/Index/Internal.hs +++ b/plutus-ledger/src/Ledger/Index/Internal.hs @@ -36,7 +36,7 @@ import Data.Text (Text) import GHC.Generics (Generic) import Ledger.Orphans () import Ledger.Tx.CardanoAPI.Internal (CardanoTx, pattern CardanoEmulatorEraTx) -import Plutus.V1.Ledger.Scripts qualified as Scripts +import PlutusLedgerApi.V1.Scripts qualified as Scripts import Prettyprinter (Pretty (..), hang, vsep, (<+>)) import Prettyprinter.Extras (PrettyShow (..)) import Prettyprinter.Util (reflow) diff --git a/plutus-ledger/src/Ledger/Orphans.hs b/plutus-ledger/src/Ledger/Orphans.hs index cedfe97f50..b4348558c5 100644 --- a/plutus-ledger/src/Ledger/Orphans.hs +++ b/plutus-ledger/src/Ledger/Orphans.hs @@ -23,8 +23,8 @@ import Data.Text qualified as Text import GHC.Generics (Generic) import Ledger.Crypto (PrivateKey (PrivateKey, getPrivateKey)) import Plutus.V1.Ledger.Api (LedgerBytes, POSIXTime (POSIXTime), TxId (TxId), fromBytes) -import Plutus.V1.Ledger.Bytes (bytes) -import Plutus.V1.Ledger.Scripts (ScriptError) +import PlutusLedgerApi.V1.Bytes (bytes) +import PlutusLedgerApi.V1.Scripts (ScriptError) import Web.HttpApiData (FromHttpApiData (parseUrlPiece), ToHttpApiData (toUrlPiece)) -- TODO: remove this dependency here once the instance of Ord for AddressInEra diff --git a/plutus-ledger/src/Ledger/Scripts.hs b/plutus-ledger/src/Ledger/Scripts.hs index 67597ae1ef..3e38b573ba 100644 --- a/plutus-ledger/src/Ledger/Scripts.hs +++ b/plutus-ledger/src/Ledger/Scripts.hs @@ -12,7 +12,7 @@ import Cardano.Api (PlutusScriptVersion (PlutusScriptV1), Script (PlutusScript), examplePlutusScriptAlwaysFails, examplePlutusScriptAlwaysSucceeds, hashScript, serialiseToRawBytes) import Ledger.Scripts.Orphans () import Plutus.Script.Utils.Scripts as Export -import Plutus.V1.Ledger.Scripts as Export +import PlutusLedgerApi.V1.Scripts as Export import PlutusTx.Builtins (BuiltinByteString, toBuiltin) diff --git a/plutus-ledger/src/Ledger/Scripts/Orphans.hs b/plutus-ledger/src/Ledger/Scripts/Orphans.hs index 8d93f10a4f..1790f4dde4 100644 --- a/plutus-ledger/src/Ledger/Scripts/Orphans.hs +++ b/plutus-ledger/src/Ledger/Scripts/Orphans.hs @@ -9,7 +9,7 @@ import Ledger.Builtins.Orphans () import Codec.CBOR.Extras (SerialiseViaFlat (..)) import Data.Aeson.Extras qualified as JSON -import Plutus.V1.Ledger.Scripts +import PlutusLedgerApi.V1.Scripts import Data.Aeson (FromJSON (parseJSON), FromJSONKey, ToJSON (toJSON), ToJSONKey) import Data.Aeson qualified as JSON diff --git a/plutus-ledger/src/Ledger/Test.hs b/plutus-ledger/src/Ledger/Test.hs index 1b892e10bf..76d6aedf0b 100644 --- a/plutus-ledger/src/Ledger/Test.hs +++ b/plutus-ledger/src/Ledger/Test.hs @@ -15,10 +15,10 @@ import Plutus.Script.Utils.V1.Address qualified as PV1 import Plutus.Script.Utils.V1.Scripts qualified as PV1 import Plutus.Script.Utils.V2.Address qualified as PV2 import Plutus.Script.Utils.V2.Scripts qualified as PV2 -import Plutus.V1.Ledger.Api (Address, Validator) -import Plutus.V1.Ledger.Api qualified as PV1 -import Plutus.V1.Ledger.Value qualified as Value -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1 (Address, Validator) +import PlutusLedgerApi.V1 qualified as PV1 +import PlutusLedgerApi.V1.Value qualified as Value +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import Prelude hiding (not) diff --git a/plutus-ledger/src/Ledger/Tx.hs b/plutus-ledger/src/Ledger/Tx.hs index d9789effc1..7503e0fd0d 100644 --- a/plutus-ledger/src/Ledger/Tx.hs +++ b/plutus-ledger/src/Ledger/Tx.hs @@ -103,17 +103,17 @@ import Ledger.Tx.CardanoAPI (CardanoTx (CardanoTx), ToCardanoError (..), pattern import Ledger.Tx.CardanoAPI qualified as CardanoAPI import Plutus.Script.Utils.Scripts (scriptHash) -import Plutus.V1.Ledger.Api qualified as V1 -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Tx qualified as V2.Tx hiding (TxId (..), TxIn (..), TxInType (..)) +import PlutusLedgerApi.V1 qualified as V1 +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Tx qualified as V2.Tx hiding (TxId (..), TxIn (..), TxInType (..)) import Prettyprinter (Pretty (pretty), colon, hang, nest, viaShow, vsep, (<+>)) -- for re-export import Ledger.Index.Internal (UtxoIndex) import Ledger.Tx.Internal as Export -import Plutus.V1.Ledger.Tx as Export hiding (TxId (..), TxIn (..), TxInType (..), TxOut (..), inRef, inType, outAddress, +import PlutusLedgerApi.V1.Tx as Export hiding (TxId (..), TxIn (..), TxInType (..), TxOut (..), inRef, inType, outAddress, outValue, pubKeyTxIn, scriptTxIn, txOutDatum, txOutPubKey) -import Plutus.V1.Ledger.Value (Value) +import PlutusLedgerApi.V1.Value (Value) -- | A datum in a transaction output that comes from a chain index query. diff --git a/plutus-ledger/src/Ledger/Tx/CardanoAPI.hs b/plutus-ledger/src/Ledger/Tx/CardanoAPI.hs index 1366bae795..4d7998ca4a 100644 --- a/plutus-ledger/src/Ledger/Tx/CardanoAPI.hs +++ b/plutus-ledger/src/Ledger/Tx/CardanoAPI.hs @@ -49,7 +49,7 @@ import Ledger.Index.Internal qualified as P import Ledger.Scripts qualified as P import Ledger.Tx.CardanoAPI.Internal import Ledger.Tx.Internal qualified as P -import Plutus.V1.Ledger.Api qualified as PV1 +import PlutusLedgerApi.V1 qualified as PV1 toCardanoMintWitness :: PV1.Redeemer -> Maybe (P.Versioned PV1.TxOutRef) -> Maybe (P.Versioned PV1.MintingPolicy) -> Either ToCardanoError (C.ScriptWitness C.WitCtxMint C.BabbageEra) diff --git a/plutus-ledger/src/Ledger/Tx/CardanoAPI/Internal.hs b/plutus-ledger/src/Ledger/Tx/CardanoAPI/Internal.hs index aecdd78b0b..17e57f24ff 100644 --- a/plutus-ledger/src/Ledger/Tx/CardanoAPI/Internal.hs +++ b/plutus-ledger/src/Ledger/Tx/CardanoAPI/Internal.hs @@ -134,10 +134,10 @@ import Plutus.Script.Utils.Ada qualified as P import Plutus.Script.Utils.V1.Scripts qualified as PV1 import Plutus.Script.Utils.V2.Scripts qualified as PV2 import Plutus.V1.Ledger.Api qualified as PV1 -import Plutus.V1.Ledger.Credential qualified as Credential -import Plutus.V1.Ledger.Tx qualified as PV1 -import Plutus.V1.Ledger.Value qualified as Value -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1.Credential qualified as Credential +import PlutusLedgerApi.V1.Tx qualified as PV1 +import PlutusLedgerApi.V1.Value qualified as Value +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx.Prelude qualified as PlutusTx import Prettyprinter (Pretty (pretty), colon, viaShow, (<+>)) diff --git a/plutus-ledger/src/Ledger/Tx/Internal.hs b/plutus-ledger/src/Ledger/Tx/Internal.hs index ea96bf8103..5b348ab44e 100644 --- a/plutus-ledger/src/Ledger/Tx/Internal.hs +++ b/plutus-ledger/src/Ledger/Tx/Internal.hs @@ -45,9 +45,9 @@ import Ledger.Tx.Orphans () import Ledger.Tx.Orphans.V2 () import Plutus.Script.Utils.Scripts -import Plutus.V1.Ledger.Api (Credential, DCert, dataToBuiltinData) -import Plutus.V1.Ledger.Scripts -import Plutus.V1.Ledger.Tx hiding (TxIn (..), TxInType (..), TxOut (..), inRef, inType, pubKeyTxIn, scriptTxIn) +import PlutusLedgerApi.V1 (Credential, DCert, dataToBuiltinData) +import PlutusLedgerApi.V1.Scripts +import PlutusLedgerApi.V1.Tx hiding (TxIn (..), TxInType (..), TxOut (..), inRef, inType, pubKeyTxIn, scriptTxIn) import PlutusTx (FromData (..)) import PlutusTx.Prelude qualified as PlutusTx import Prettyprinter (Pretty (..), viaShow) diff --git a/plutus-ledger/src/Ledger/Tx/Orphans/V1.hs b/plutus-ledger/src/Ledger/Tx/Orphans/V1.hs index 843121fe99..f540672009 100644 --- a/plutus-ledger/src/Ledger/Tx/Orphans/V1.hs +++ b/plutus-ledger/src/Ledger/Tx/Orphans/V1.hs @@ -26,8 +26,8 @@ import Ledger.Builtins.Orphans () import Ledger.Value.Orphans () import Plutus.V1.Ledger.Api -import Plutus.V1.Ledger.Bytes qualified as Bytes -import Plutus.V1.Ledger.Tx +import PlutusLedgerApi.V1.Bytes qualified as Bytes +import PlutusLedgerApi.V1.Tx deriving newtype instance Serialise LedgerBytes deriving anyclass instance FromJSONKey LedgerBytes diff --git a/plutus-ledger/src/Ledger/Tx/Orphans/V2.hs b/plutus-ledger/src/Ledger/Tx/Orphans/V2.hs index b15be81b5e..3e31efa4bd 100644 --- a/plutus-ledger/src/Ledger/Tx/Orphans/V2.hs +++ b/plutus-ledger/src/Ledger/Tx/Orphans/V2.hs @@ -19,7 +19,7 @@ import Ledger.Address.Orphans () import Ledger.Builtins.Orphans () import Ledger.Value.Orphans () -import Plutus.V2.Ledger.Api +import PlutusLedgerApi.V2 deriving anyclass instance ToJSON OutputDatum deriving anyclass instance FromJSON OutputDatum diff --git a/plutus-ledger/src/Ledger/Typed/Scripts.hs b/plutus-ledger/src/Ledger/Typed/Scripts.hs index c59737f8ba..0ecb6c4584 100644 --- a/plutus-ledger/src/Ledger/Typed/Scripts.hs +++ b/plutus-ledger/src/Ledger/Typed/Scripts.hs @@ -22,7 +22,7 @@ import Plutus.Script.Utils.Scripts qualified as Untyped import Plutus.Script.Utils.Typed as Export import Plutus.Script.Utils.V1.Typed.Scripts qualified as PV1 import Plutus.Script.Utils.V2.Typed.Scripts qualified as PV2 -import Plutus.V1.Ledger.Api (MintingPolicy, Validator) +import PlutusLedgerApi.V1 (MintingPolicy, Validator) mkForwardingMintingPolicy :: Versioned Validator -> Versioned MintingPolicy mkForwardingMintingPolicy vl@(Versioned _ PlutusV1) = Versioned (PV1.mkForwardingMintingPolicy (Untyped.validatorHash vl)) PlutusV1 diff --git a/plutus-ledger/src/Ledger/Value/Orphans.hs b/plutus-ledger/src/Ledger/Value/Orphans.hs index 8bf1ae5580..16d1bde045 100644 --- a/plutus-ledger/src/Ledger/Value/Orphans.hs +++ b/plutus-ledger/src/Ledger/Value/Orphans.hs @@ -17,7 +17,7 @@ import Data.Text qualified as Text import Data.Text.Encoding qualified as E import GHC.Generics (Generic) import Plutus.V1.Ledger.Bytes qualified as Bytes -import Plutus.V1.Ledger.Value +import PlutusLedgerApi.V1.Value import PlutusTx.AssocMap qualified as Map import PlutusTx.Prelude qualified as PlutusTx import Prettyprinter (Pretty (pretty), (<+>)) @@ -63,7 +63,7 @@ instance ToJSON TokenName where (\bs -> Text.cons '\NUL' (asBase16 bs)) (\t -> case Text.take 1 t of "\NUL" -> Text.concat ["\NUL\NUL", t]; _ -> t) where - -- copied from 'Plutus.V1.Ledger.Value' because not exported + -- copied from 'PlutusLedgerApi.V1.Value' because not exported asBase16 :: BS.ByteString -> Text.Text asBase16 bs = Text.concat ["0x", Bytes.encodeByteString bs] diff --git a/plutus-pab/src/Cardano/Wallet/LocalClient/ExportTx.hs b/plutus-pab/src/Cardano/Wallet/LocalClient/ExportTx.hs index bf7b12644a..4e8b437603 100644 --- a/plutus-pab/src/Cardano/Wallet/LocalClient/ExportTx.hs +++ b/plutus-pab/src/Cardano/Wallet/LocalClient/ExportTx.hs @@ -42,8 +42,8 @@ import Ledger qualified as P import Ledger.Tx (CardanoTx, TxOutRef) import Ledger.Tx.CardanoAPI (fromPlutusIndex) import Ledger.Tx.Constraints (UnbalancedTx (UnbalancedCardanoTx)) -import Plutus.V1.Ledger.Api qualified as Plutus -import Plutus.V1.Ledger.Scripts (MintingPolicyHash) +import PlutusLedgerApi.V1 qualified as Plutus +import PlutusLedgerApi.V1.Scripts (MintingPolicyHash) import PlutusTx qualified import Wallet.API qualified as WAPI import Wallet.Effects (WalletEffect, balanceTx, yieldUnbalancedTx) diff --git a/plutus-pab/src/Cardano/Wallet/Mock/API.hs b/plutus-pab/src/Cardano/Wallet/Mock/API.hs index 953557752b..d523f0a195 100644 --- a/plutus-pab/src/Cardano/Wallet/Mock/API.hs +++ b/plutus-pab/src/Cardano/Wallet/Mock/API.hs @@ -10,7 +10,7 @@ import Data.List.NonEmpty (NonEmpty) import Ledger (CardanoAddress, PaymentPubKeyHash) import Ledger.Tx (CardanoTx) import Ledger.Tx.Constraints.OffChain (UnbalancedTx) -import Plutus.V1.Ledger.Api (Value) +import PlutusLedgerApi.V1 (Value) import Servant.API (Capture, Get, JSON, NoContent, Post, QueryParam, ReqBody, (:<|>), (:>)) import Wallet.Emulator.Error (WalletAPIError) diff --git a/plutus-pab/src/Cardano/Wallet/Mock/Client.hs b/plutus-pab/src/Cardano/Wallet/Mock/Client.hs index b10304be5b..7d3b0aebab 100644 --- a/plutus-pab/src/Cardano/Wallet/Mock/Client.hs +++ b/plutus-pab/src/Cardano/Wallet/Mock/Client.hs @@ -21,7 +21,7 @@ import Data.Proxy (Proxy (Proxy)) import Ledger (CardanoAddress, PaymentPubKeyHash) import Ledger.Tx (CardanoTx) import Ledger.Tx.Constraints.OffChain (UnbalancedTx) -import Plutus.V1.Ledger.Api (Value) +import PlutusLedgerApi.V1 (Value) import Servant ((:<|>) ((:<|>))) import Servant.Client (ClientEnv, ClientError, ClientM, client, runClientM) import Wallet.Effects (WalletEffect (BalanceTx, OwnAddresses, SubmitTxn, TotalFunds, WalletAddSignature, YieldUnbalancedTx)) diff --git a/plutus-pab/src/Plutus/PAB/Arbitrary.hs b/plutus-pab/src/Plutus/PAB/Arbitrary.hs index 5df26d5852..9de79a3d2e 100644 --- a/plutus-pab/src/Plutus/PAB/Arbitrary.hs +++ b/plutus-pab/src/Plutus/PAB/Arbitrary.hs @@ -38,8 +38,8 @@ import Plutus.Script.Utils.V1.Address (mkValidatorAddress) import Plutus.Script.Utils.V1.Typed.Scripts (ConnectionError, WrongOutTypeError) import Plutus.Script.Utils.Value qualified as Plutus import Plutus.V1.Ledger.Api (Address (..), LedgerBytes, PubKeyHash, ValidatorHash (ValidatorHash)) -import Plutus.V1.Ledger.Bytes qualified as LedgerBytes -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1.Bytes qualified as LedgerBytes +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import PlutusTx.AssocMap qualified as AssocMap import PlutusTx.Prelude qualified as PlutusTx diff --git a/plutus-pab/src/Plutus/PAB/Core.hs b/plutus-pab/src/Plutus/PAB/Core.hs index 621c2781b9..f0b891a75a 100644 --- a/plutus-pab/src/Plutus/PAB/Core.hs +++ b/plutus-pab/src/Plutus/PAB/Core.hs @@ -134,7 +134,7 @@ import Plutus.PAB.Timeout qualified as Timeout import Plutus.PAB.Types (PABError (ContractInstanceNotFound, InstanceAlreadyStopped, OtherError, WalletError)) import Plutus.PAB.Webserver.Types (ContractActivationArgs (ContractActivationArgs, caID, caWallet)) import Plutus.Script.Utils.Value (Value) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) import Wallet.API (Slot) import Wallet.API qualified as WAPI import Wallet.Effects (NodeClientEffect, WalletEffect) diff --git a/plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs b/plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs index ddb1b4ca1e..def6f5b7fb 100644 --- a/plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs +++ b/plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs @@ -80,7 +80,7 @@ import Plutus.PAB.Effects.UUID (UUIDEffect, uuidNextRandom) import Plutus.PAB.Events.Contract (ContractInstanceId (ContractInstanceId)) import Plutus.PAB.Types (PABError) import Plutus.PAB.Webserver.Types (ContractActivationArgs (ContractActivationArgs, caID, caWallet)) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) import Wallet.Effects (NodeClientEffect, WalletEffect) import Wallet.Emulator.LogMessages (TxBalanceMsg) import Wallet.Emulator.Wallet qualified as Wallet diff --git a/plutus-pab/src/Plutus/PAB/Core/ContractInstance/BlockchainEnv.hs b/plutus-pab/src/Plutus/PAB/Core/ContractInstance/BlockchainEnv.hs index e1e22429cc..dcccfea25c 100644 --- a/plutus-pab/src/Plutus/PAB/Core/ContractInstance/BlockchainEnv.hs +++ b/plutus-pab/src/Plutus/PAB/Core/ContractInstance/BlockchainEnv.hs @@ -56,7 +56,7 @@ import Plutus.PAB.Types (Config (Config, dbConfig), DbConfig (..), WebserverConfig (WebserverConfig, enableMarconi), developmentOptions, nodeServerConfig, pabWebserverConfig) import Plutus.Trace.Emulator.ContractInstance (IndexedBlock (..), indexBlock) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) import System.Random -- | Connect to the node and write node updates to the blockchain diff --git a/plutus-pab/src/Plutus/PAB/Core/ContractInstance/STM.hs b/plutus-pab/src/Plutus/PAB/Core/ContractInstance/STM.hs index 9c0d9ce9c0..75a67f3a70 100644 --- a/plutus-pab/src/Plutus/PAB/Core/ContractInstance/STM.hs +++ b/plutus-pab/src/Plutus/PAB/Core/ContractInstance/STM.hs @@ -75,7 +75,7 @@ import Plutus.ChainIndex.UtxoState (UtxoIndex, UtxoState (_usTxUtxoData), utxoSt import Plutus.Contract.Effects (ActiveEndpoint (ActiveEndpoint, aeDescription)) import Plutus.Contract.Resumable (IterationID, Request (Request, itID, rqID, rqRequest), RequestID) import Plutus.PAB.Core.Indexer.TxConfirmationStatus (TCSIndex) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) import Wallet.Types (ContractInstanceId, EndpointDescription, EndpointValue (EndpointValue), NotificationError (EndpointNotAvailable, InstanceDoesNotExist, MoreThanOneEndpointAvailable)) import Wallet.Types qualified as Wallet (ContractActivityStatus (Active, Done, Stopped)) diff --git a/plutus-pab/src/Plutus/PAB/Core/Indexer/TxConfirmationStatus.hs b/plutus-pab/src/Plutus/PAB/Core/Indexer/TxConfirmationStatus.hs index 5a1970a2b0..7fc32fed30 100644 --- a/plutus-pab/src/Plutus/PAB/Core/Indexer/TxConfirmationStatus.hs +++ b/plutus-pab/src/Plutus/PAB/Core/Indexer/TxConfirmationStatus.hs @@ -32,7 +32,7 @@ import GHC.Generics (Generic) import Plutus.ChainIndex.Types (BlockNumber (BlockNumber), TxConfirmedState (TxConfirmedState, blockAdded, timesConfirmed, validity), TxValidity (TxValid)) -import Plutus.V1.Ledger.Api (TxId) +import PlutusLedgerApi.V1 (TxId) import Marconi.Core.Index.VSqlite (SqliteIndex) import Marconi.Core.Index.VSqlite qualified as Ix diff --git a/plutus-pab/src/Plutus/PAB/Simulator.hs b/plutus-pab/src/Plutus/PAB/Simulator.hs index 33607c36c7..b68984a833 100644 --- a/plutus-pab/src/Plutus/PAB/Simulator.hs +++ b/plutus-pab/src/Plutus/PAB/Simulator.hs @@ -128,7 +128,7 @@ import Plutus.PAB.Webserver.Types (ContractActivationArgs) import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value (Value, flattenValue) import Plutus.Trace.Emulator.System (appendNewTipBlock) -import Plutus.V1.Ledger.Tx (TxId, TxOutRef) +import PlutusLedgerApi.V1.Tx (TxId, TxOutRef) import Prettyprinter (Pretty (pretty), defaultLayoutOptions, layoutPretty) import Prettyprinter.Render.Text qualified as Render import Wallet.API qualified as WAPI diff --git a/plutus-pab/src/Plutus/PAB/Webserver/Types.hs b/plutus-pab/src/Plutus/PAB/Webserver/Types.hs index d2985691d9..e1ed528497 100644 --- a/plutus-pab/src/Plutus/PAB/Webserver/Types.hs +++ b/plutus-pab/src/Plutus/PAB/Webserver/Types.hs @@ -39,7 +39,7 @@ import Ledger.Tx.CardanoAPI (CardanoBuildTx) import Ledger.Tx.Constraints.OffChain (UnbalancedTx) import Plutus.Contract.Effects (ActiveEndpoint, ChainIndexQuery, PABReq) import Plutus.PAB.Events.ContractInstanceState (PartiallyDecodedResponse) -import Plutus.V1.Ledger.Api (DCert, LedgerBytes (LedgerBytes)) +import PlutusLedgerApi.V1 (DCert, LedgerBytes (LedgerBytes)) import Prettyprinter (Pretty, pretty, (<+>)) import Wallet.Emulator.Wallet (Wallet, WalletId (WalletId)) import Wallet.Rollup.Types (AnnotatedTx, BeneficialOwner, DereferencedInput, SequenceId) diff --git a/plutus-pab/test/light/Cardano/Wallet/LocalClient/ExportTxSpec.hs b/plutus-pab/test/light/Cardano/Wallet/LocalClient/ExportTxSpec.hs index d771ee8a78..4c2e69e171 100644 --- a/plutus-pab/test/light/Cardano/Wallet/LocalClient/ExportTxSpec.hs +++ b/plutus-pab/test/light/Cardano/Wallet/LocalClient/ExportTxSpec.hs @@ -22,7 +22,7 @@ import Hedgehog.Range qualified as Range import Ledger (TxOutRef (TxOutRef)) import Ledger.Scripts qualified as Script import Ledger.Tx.CardanoAPI (fromCardanoPolicyId, fromCardanoTxId) -import Plutus.V1.Ledger.Scripts (MintingPolicyHash) +import PlutusLedgerApi.V1.Scripts (MintingPolicyHash) import Test.Tasty (TestTree, testGroup) import Test.Tasty.Hedgehog (testProperty) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/Ada.hs b/plutus-script-utils/src/Plutus/Script/Utils/Ada.hs index 7066767f5d..622eb7a803 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/Ada.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/Ada.hs @@ -34,8 +34,8 @@ import Codec.Serialise.Class (Serialise) import Data.Aeson (FromJSON, ToJSON) import Data.Tagged (Tagged (Tagged)) import GHC.Generics (Generic) -import Plutus.V1.Ledger.Value (CurrencySymbol (CurrencySymbol), TokenName (TokenName), Value) -import Plutus.V1.Ledger.Value qualified as TH +import PlutusLedgerApi.V1.Value (CurrencySymbol (CurrencySymbol), TokenName (TokenName), Value) +import PlutusLedgerApi.V1.Value qualified as TH import PlutusTx qualified import PlutusTx.Lift (makeLift) import PlutusTx.Prelude (AdditiveGroup, AdditiveMonoid, AdditiveSemigroup ((+)), Bool, Eq ((==)), Integer, Monoid, diff --git a/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs b/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs index 32d7471b74..ea6df9ec7d 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs @@ -38,8 +38,8 @@ import Data.Aeson (FromJSON, ToJSON) import Data.ByteString.Lazy qualified as BSL import Data.ByteString.Short qualified as SBS import GHC.Generics (Generic) -import Plutus.V1.Ledger.Api qualified as PV1 -import Plutus.V1.Ledger.Scripts qualified as PV1 +import PlutusLedgerApi.V1 qualified as PV1 +import PlutusLedgerApi.V1.Scripts qualified as PV1 import PlutusTx.Builtins qualified as Builtins import Prettyprinter (Pretty (pretty)) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/Typed.hs b/plutus-script-utils/src/Plutus/Script/Utils/Typed.hs index ebee959a80..4c443dbdac 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/Typed.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/Typed.hs @@ -39,9 +39,9 @@ import GHC.Generics (Generic) import Plutus.Script.Utils.Scripts (Versioned (Versioned, unversioned, version)) import Plutus.Script.Utils.V1.Address qualified as PSU.PV1 import Plutus.Script.Utils.V2.Address qualified as PSU.PV2 -import Plutus.V1.Ledger.Address qualified as PV1 -import Plutus.V1.Ledger.Api qualified as PV1 -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V1.Address qualified as PV1 +import PlutusLedgerApi.V1 qualified as PV1 +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx.Prelude (BuiltinData, BuiltinString, check, trace) type UntypedValidator = BuiltinData -> BuiltinData -> BuiltinData -> () @@ -153,7 +153,7 @@ class PV1.UnsafeFromData sc => IsScriptContext sc where -- -- @ -- import PlutusTx qualified - -- import Plutus.V2.Ledger.Scripts qualified as Plutus + -- import PlutusLedgerApi.V2.Scripts qualified as Plutus -- import Plutus.Script.Utils.V2.Scripts (mkUntypedValidator) -- -- newtype MyCustomDatum = MyCustomDatum Integer @@ -175,7 +175,7 @@ class PV1.UnsafeFromData sc => IsScriptContext sc where -- -- @ -- import PlutusTx qualified - -- import Plutus.V2.Ledger.Scripts qualified as Plutus + -- import PlutusLedgerApi.V2.Scripts qualified as Plutus -- import Plutus.Script.Utils.V2.Scripts (mkUntypedValidator) -- -- newtype MyCustomDatum = MyCustomDatum Integer @@ -217,7 +217,7 @@ class PV1.UnsafeFromData sc => IsScriptContext sc where -- -- @ -- import PlutusTx qualified - -- import Plutus.V1.Ledger.Scripts qualified as Plutus + -- import PlutusLedgerApi.V1.Scripts qualified as Plutus -- import Plutus.Script.Utils.V1.Scripts (mkUntypedStakeValidator) -- -- newtype MyCustomRedeemer = MyCustomRedeemer Integer @@ -255,7 +255,7 @@ class PV1.UnsafeFromData sc => IsScriptContext sc where -- -- @ -- import PlutusTx qualified - -- import Plutus.V1.Ledger.Scripts qualified as Plutus + -- import PlutusLedgerApi.V1.Scripts qualified as Plutus -- import Plutus.Script.Utils.V1.Scripts (mkUntypedMintingPolicy) -- -- newtype MyCustomRedeemer = MyCustomRedeemer Integer diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Address.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Address.hs index 7fb40631d6..1ba7007532 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Address.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Address.hs @@ -8,7 +8,7 @@ module Plutus.Script.Utils.V1.Address import Cardano.Api qualified as Script import Plutus.Script.Utils.V1.Scripts qualified as PV1 -import Plutus.V1.Ledger.Api (Address (Address), Credential (ScriptCredential), Script, Validator, getMintingPolicy, +import PlutusLedgerApi.V1 (Address (Address), Credential (ScriptCredential), Script, Validator, getMintingPolicy, getStakeValidator, getValidator) {-# INLINABLE mkValidatorAddress #-} diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Contexts.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Contexts.hs index 02a5bc9be7..c37870bab6 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Contexts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Contexts.hs @@ -7,8 +7,8 @@ module Plutus.Script.Utils.V1.Contexts , valuePaidTo ) where -import Plutus.V1.Ledger.Api (Address, Value) -import Plutus.V1.Ledger.Contexts as Contexts hiding (valuePaidTo) +import PlutusLedgerApi.V1 (Address, Value) +import PlutusLedgerApi.V1.Contexts as Contexts hiding (valuePaidTo) import PlutusTx.Prelude (Maybe (Just, Nothing), mapMaybe, mconcat, (==)) {-# INLINABLE outputsAt #-} diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Generators.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Generators.hs index 5e1bbc0b65..6c6c796f37 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Generators.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Generators.hs @@ -13,9 +13,9 @@ module Plutus.Script.Utils.V1.Generators ) where import Plutus.Script.Utils.Scripts qualified as Ledger -import Plutus.V1.Ledger.Scripts qualified as Ledger -import Plutus.V1.Ledger.Value (TokenName, Value) -import Plutus.V1.Ledger.Value qualified as Value +import PlutusLedgerApi.V1.Scripts qualified as Ledger +import PlutusLedgerApi.V1.Value (TokenName, Value) +import PlutusLedgerApi.V1.Value qualified as Value import PlutusTx qualified import Plutus.Script.Utils.V1.Scripts qualified as Scripts diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Scripts.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Scripts.hs index 9ffff81fff..2998c6759e 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Scripts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Scripts.hs @@ -29,8 +29,8 @@ import Cardano.Api.Shelley qualified as Script import Codec.Serialise (serialise) import Data.ByteString.Lazy qualified as BSL import Data.ByteString.Short qualified as SBS -import Plutus.V1.Ledger.Api qualified as PV1 -import Plutus.V1.Ledger.Scripts qualified as PV1 +import PlutusLedgerApi.V1 qualified as PV1 +import PlutusLedgerApi.V1.Scripts qualified as PV1 import PlutusTx.Builtins qualified as Builtins -- | Hash a 'PV1.Validator' script. diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Tx.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Tx.hs index 54204c67d8..a55d08000a 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Tx.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Tx.hs @@ -5,7 +5,7 @@ module Plutus.Script.Utils.V1.Tx import Plutus.Script.Utils.Scripts (datumHash) import Plutus.Script.Utils.V1.Address (mkValidatorAddress) -import Plutus.V1.Ledger.Api (Address, Datum, TxOut (TxOut), Validator, Value) +import PlutusLedgerApi.V1 (Address, Datum, TxOut (TxOut), Validator, Value) -- | Create a transaction output locked by a validator script and attach the given data -- script. diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts.hs index 4614cf4cd8..b78bd3c958 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts.hs @@ -26,7 +26,7 @@ import Plutus.Script.Utils.Scripts (datumHash) import Plutus.Script.Utils.V1.Typed.Scripts.MonetaryPolicies hiding (forwardToValidator) import Plutus.Script.Utils.V1.Typed.Scripts.StakeValidators hiding (forwardToValidator) import Plutus.Script.Utils.V1.Typed.Scripts.Validators -import Plutus.V1.Ledger.Api (Credential (PubKeyCredential, ScriptCredential), Datum (Datum), FromData, MintingPolicy, +import PlutusLedgerApi.V1 (Credential (PubKeyCredential, ScriptCredential), Datum (Datum), FromData, MintingPolicy, StakeValidator, ToData (..), TxOut (TxOut, txOutAddress, txOutDatumHash, txOutValue), TxOutRef, Validator, Value, addressCredential) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/MonetaryPolicies.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/MonetaryPolicies.hs index 253c46129d..2719a4723c 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/MonetaryPolicies.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/MonetaryPolicies.hs @@ -16,12 +16,12 @@ module Plutus.Script.Utils.V1.Typed.Scripts.MonetaryPolicies ) where import Plutus.Script.Utils.Typed (mkUntypedMintingPolicy) -import Plutus.V1.Ledger.Api (Address (Address, addressCredential), Credential (ScriptCredential), MintingPolicy, +import PlutusLedgerApi.V1 (Address (Address, addressCredential), Credential (ScriptCredential), MintingPolicy, ValidatorHash, mkMintingPolicyScript) -import Plutus.V1.Ledger.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), +import PlutusLedgerApi.V1.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), ScriptPurpose (Minting), TxInfo (TxInfo, txInfoInputs)) -import Plutus.V1.Ledger.Contexts qualified as PV1 -import Plutus.V1.Ledger.Tx (TxOut (TxOut, txOutAddress)) +import PlutusLedgerApi.V1.Contexts qualified as PV1 +import PlutusLedgerApi.V1.Tx (TxOut (TxOut, txOutAddress)) import PlutusTx qualified import PlutusTx.Prelude (Bool (False), any, ($), (.), (==)) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/StakeValidators.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/StakeValidators.hs index 925cdf8add..d4ee7d1a39 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/StakeValidators.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/StakeValidators.hs @@ -15,12 +15,12 @@ module Plutus.Script.Utils.V1.Typed.Scripts.StakeValidators ) where import Plutus.Script.Utils.Typed (mkUntypedStakeValidator) -import Plutus.V1.Ledger.Api (Address (Address, addressCredential), Credential (ScriptCredential), StakeValidator, +import PlutusLedgerApi.V1 (Address (Address, addressCredential), Credential (ScriptCredential), StakeValidator, ValidatorHash, mkStakeValidatorScript) -import Plutus.V1.Ledger.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), +import PlutusLedgerApi.V1.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), ScriptPurpose (Certifying, Rewarding), TxInfo (TxInfo, txInfoInputs)) -import Plutus.V1.Ledger.Contexts qualified as PV1 -import Plutus.V1.Ledger.Tx (TxOut (TxOut, txOutAddress)) +import PlutusLedgerApi.V1.Contexts qualified as PV1 +import PlutusLedgerApi.V1.Tx (TxOut (TxOut, txOutAddress)) import PlutusTx qualified import PlutusTx.Prelude (Bool (False), any, ($), (.), (==)) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/Validators.hs b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/Validators.hs index 2896d17864..545306a0fc 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/Validators.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V1/Typed/Scripts/Validators.hs @@ -48,8 +48,8 @@ import Plutus.Script.Utils.Typed (DatumType, RedeemerType, vValidatorScript, validatorAddress, validatorHash, validatorScript) import Plutus.Script.Utils.V1.Scripts qualified as Scripts import Plutus.Script.Utils.V1.Typed.Scripts.MonetaryPolicies qualified as MPS -import Plutus.V1.Ledger.Address qualified as PV1 -import Plutus.V1.Ledger.Api qualified as PV1 +import PlutusLedgerApi.V1.Address qualified as PV1 +import PlutusLedgerApi.V1 qualified as PV1 import PlutusCore.Default (DefaultUni) import PlutusTx (CompiledCode, Lift, applyCode, liftCode) import Prettyprinter (Pretty (pretty), viaShow, (<+>)) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Address.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Address.hs index b97bb318bf..943516d34f 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Address.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Address.hs @@ -8,7 +8,7 @@ module Plutus.Script.Utils.V2.Address import Cardano.Api qualified as Script import Plutus.Script.Utils.V2.Scripts qualified as PV2 -import Plutus.V2.Ledger.Api (Address (Address), Credential (ScriptCredential), Script, Validator, getMintingPolicy, +import PlutusLedgerApi.V2 (Address (Address), Credential (ScriptCredential), Script, Validator, getMintingPolicy, getStakeValidator, getValidator) {-# INLINABLE mkValidatorAddress #-} diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Contexts.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Contexts.hs index 31864f16fb..6e6d75465b 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Contexts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Contexts.hs @@ -13,9 +13,9 @@ module Plutus.Script.Utils.V2.Contexts , valuePaidTo ) where -import Plutus.V1.Ledger.Api (Address, Value) -import Plutus.V2.Ledger.Api qualified as PV2 -import Plutus.V2.Ledger.Contexts as Contexts hiding (findTxInByTxOutRef, valuePaidTo) +import PlutusLedgerApi.V1 (Address, Value) +import PlutusLedgerApi.V2 qualified as PV2 +import PlutusLedgerApi.V2.Contexts as Contexts hiding (findTxInByTxOutRef, valuePaidTo) import PlutusTx.Prelude (Maybe (Just, Nothing), find, mapMaybe, mconcat, (==)) {-# INLINABLE findTxInByTxOutRef #-} diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Generators.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Generators.hs index 9d0fb44feb..03c5157c84 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Generators.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Generators.hs @@ -9,7 +9,7 @@ module Plutus.Script.Utils.V2.Generators , PV1.someTokenValue ) where -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx qualified import Plutus.Script.Utils.V1.Generators qualified as PV1 diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Scripts.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Scripts.hs index 02492ec602..ae2409dec6 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Scripts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Scripts.hs @@ -31,7 +31,7 @@ import Codec.Serialise (serialise) import Data.ByteString.Lazy qualified as BSL import Data.ByteString.Short qualified as SBS import Plutus.Script.Utils.Scripts qualified as P -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V2 qualified as PV2 import PlutusTx.Builtins qualified as Builtins -- | Hash a 'PV2.Validator' script. diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Tx.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Tx.hs index 10c98cd984..d01e7ed192 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Tx.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Tx.hs @@ -4,7 +4,7 @@ module Plutus.Script.Utils.V2.Tx import Plutus.Script.Utils.V2.Address (mkValidatorAddress) import Plutus.Script.Utils.V2.Scripts (scriptHash) -import Plutus.V2.Ledger.Api (OutputDatum, TxOut (TxOut), Validator, Value, unValidatorScript) +import PlutusLedgerApi.V2 (OutputDatum, TxOut (TxOut), Validator, Value, unValidatorScript) type HasReferenceScript = Bool diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts.hs index 5eaf589001..149446ed5b 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts.hs @@ -26,7 +26,7 @@ import Plutus.Script.Utils.V1.Typed.Scripts.Validators qualified as V1 import Plutus.Script.Utils.V2.Typed.Scripts.MonetaryPolicies hiding (forwardToValidator) import Plutus.Script.Utils.V2.Typed.Scripts.StakeValidators hiding (forwardToValidator) import Plutus.Script.Utils.V2.Typed.Scripts.Validators -import Plutus.V2.Ledger.Api (Credential (PubKeyCredential, ScriptCredential), Datum, FromData, MintingPolicy, +import PlutusLedgerApi.V2 (Credential (PubKeyCredential, ScriptCredential), Datum, FromData, MintingPolicy, OutputDatum (OutputDatum, OutputDatumHash), StakeValidator, ToData (..), TxOut (txOutAddress, txOutDatum), TxOutRef, Validator, addressCredential) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/MonetaryPolicies.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/MonetaryPolicies.hs index c8b472a49e..3000e5f89c 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/MonetaryPolicies.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/MonetaryPolicies.hs @@ -16,12 +16,12 @@ module Plutus.Script.Utils.V2.Typed.Scripts.MonetaryPolicies ) where import Plutus.Script.Utils.Typed (mkUntypedMintingPolicy) -import Plutus.V2.Ledger.Api (Address (Address, addressCredential), Credential (ScriptCredential), MintingPolicy, +import PlutusLedgerApi.V2 (Address (Address, addressCredential), Credential (ScriptCredential), MintingPolicy, ValidatorHash, mkMintingPolicyScript) -import Plutus.V2.Ledger.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), +import PlutusLedgerApi.V2.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), ScriptPurpose (Minting), TxInfo (TxInfo, txInfoInputs)) -import Plutus.V2.Ledger.Contexts qualified as PV2 -import Plutus.V2.Ledger.Tx (TxOut (TxOut, txOutAddress)) +import PlutusLedgerApi.V2.Contexts qualified as PV2 +import PlutusLedgerApi.V2.Tx (TxOut (TxOut, txOutAddress)) import PlutusTx qualified import PlutusTx.Prelude (Bool (False), any, ($), (.), (==)) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/StakeValidators.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/StakeValidators.hs index 554bcf9271..80b3f217a2 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/StakeValidators.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/StakeValidators.hs @@ -15,12 +15,12 @@ module Plutus.Script.Utils.V2.Typed.Scripts.StakeValidators ) where import Plutus.Script.Utils.Typed (mkUntypedStakeValidator) -import Plutus.V2.Ledger.Api (Address (Address, addressCredential), Credential (ScriptCredential), StakeValidator, +import PlutusLedgerApi.V2 (Address (Address, addressCredential), Credential (ScriptCredential), StakeValidator, ValidatorHash, mkStakeValidatorScript) -import Plutus.V2.Ledger.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), +import PlutusLedgerApi.V2.Contexts (ScriptContext (ScriptContext, scriptContextPurpose, scriptContextTxInfo), ScriptPurpose (Certifying, Rewarding), TxInfo (TxInfo, txInfoInputs)) -import Plutus.V2.Ledger.Contexts qualified as PV2 -import Plutus.V2.Ledger.Tx (TxOut (TxOut, txOutAddress)) +import PlutusLedgerApi.V2.Contexts qualified as PV2 +import PlutusLedgerApi.V2.Tx (TxOut (TxOut, txOutAddress)) import PlutusTx qualified import PlutusTx.Prelude (Bool (False), any, ($), (.), (==)) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/Validators.hs b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/Validators.hs index f03685c965..58e589e27e 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/Validators.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/V2/Typed/Scripts/Validators.hs @@ -35,7 +35,7 @@ import Plutus.Script.Utils.Typed (DatumType, RedeemerType, validatorAddress, validatorHash, validatorScript) import Plutus.Script.Utils.V2.Scripts qualified as Scripts import Plutus.Script.Utils.V2.Typed.Scripts.MonetaryPolicies qualified as MPS -import Plutus.V2.Ledger.Api qualified as PV2 +import PlutusLedgerApi.V2 qualified as PV2 import PlutusCore.Default (DefaultUni) import PlutusTx (CompiledCode, Lift, applyCode, liftCode) diff --git a/plutus-script-utils/src/Plutus/Script/Utils/Value.hs b/plutus-script-utils/src/Plutus/Script/Utils/Value.hs index 1d6845cfd2..1dd0d5cb36 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/Value.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/Value.hs @@ -9,7 +9,7 @@ module Plutus.Script.Utils.Value ) where import Plutus.Script.Utils.Ada qualified as Ada -import Plutus.V1.Ledger.Value as Export (AssetClass (AssetClass, unAssetClass), +import PlutusLedgerApi.V1.Value as Export (AssetClass (AssetClass, unAssetClass), CurrencySymbol (CurrencySymbol, unCurrencySymbol), TokenName (TokenName, unTokenName), Value (Value, getValue), adaSymbol, adaToken, assetClass, assetClassValue, assetClassValueOf, currencyMPSHash, diff --git a/plutus-tx-constraints/src/Ledger/Tx/Constraints/OffChain.hs b/plutus-tx-constraints/src/Ledger/Tx/Constraints/OffChain.hs index 783a242c96..7afc736e97 100644 --- a/plutus-tx-constraints/src/Ledger/Tx/Constraints/OffChain.hs +++ b/plutus-tx-constraints/src/Ledger/Tx/Constraints/OffChain.hs @@ -128,8 +128,8 @@ import Ledger.Typed.Scripts (Any, ConnectionError (UnknownRef), TypedValidator ( import Plutus.Script.Utils.Scripts (datumHash, scriptHash) import Plutus.Script.Utils.V2.Typed.Scripts qualified as Typed import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api (Datum (Datum), DatumHash, StakingCredential, Validator, Value, getMintingPolicy) -import Plutus.V1.Ledger.Scripts (MintingPolicy (MintingPolicy), MintingPolicyHash (MintingPolicyHash), Script, +import PlutusLedgerApi.V1 (Datum (Datum), DatumHash, StakingCredential, Validator, Value, getMintingPolicy) +import PlutusLedgerApi.V1.Scripts (MintingPolicy (MintingPolicy), MintingPolicyHash (MintingPolicyHash), Script, ScriptHash (ScriptHash), Validator (Validator), ValidatorHash (ValidatorHash)) import PlutusTx (FromData, ToData (toBuiltinData)) import PlutusTx.Lattice (BoundedMeetSemiLattice (top), JoinSemiLattice ((\/)), MeetSemiLattice ((/\))) @@ -365,7 +365,7 @@ actual values we encounter on either side of the transaction. Then we compute the missing value on both sides, and add an input with the join of the positive parts [1] of the missing values. -[1] See 'Plutus.V1.Ledger.Value.split' +[1] See 'PlutusLedgerApi.V1.Value.split' -} diff --git a/plutus-tx-constraints/src/Ledger/Tx/Constraints/OnChain/V2.hs b/plutus-tx-constraints/src/Ledger/Tx/Constraints/OnChain/V2.hs index 2168b04463..5e836aa4ee 100644 --- a/plutus-tx-constraints/src/Ledger/Tx/Constraints/OnChain/V2.hs +++ b/plutus-tx-constraints/src/Ledger/Tx/Constraints/OnChain/V2.hs @@ -33,8 +33,8 @@ import Plutus.Script.Utils.V2.Contexts (ScriptContext (ScriptContext, scriptCont import Plutus.Script.Utils.V2.Contexts qualified as PV2 import Plutus.Script.Utils.Value qualified as Value import Plutus.V1.Ledger.Interval (contains) -import Plutus.V1.Ledger.Value (leq) -import Plutus.V2.Ledger.Tx (OutputDatum (NoOutputDatum, OutputDatum, OutputDatumHash)) +import PlutusLedgerApi.V1.Value (leq) +import PlutusLedgerApi.V2.Tx (OutputDatum (NoOutputDatum, OutputDatum, OutputDatumHash)) import PlutusTx (ToData (toBuiltinData)) import PlutusTx.AssocMap qualified as AMap import PlutusTx.Prelude (Bool (False, True), Eq ((==)), Maybe (Just, Nothing), all, any, elem, fmap, isJust, maybe, diff --git a/plutus-tx-constraints/src/Ledger/Tx/Constraints/TxConstraints.hs b/plutus-tx-constraints/src/Ledger/Tx/Constraints/TxConstraints.hs index c5876f40fb..280546eb7d 100644 --- a/plutus-tx-constraints/src/Ledger/Tx/Constraints/TxConstraints.hs +++ b/plutus-tx-constraints/src/Ledger/Tx/Constraints/TxConstraints.hs @@ -40,12 +40,12 @@ import Ledger.Tx (DecoratedTxOut) import Plutus.Script.Utils.V1.Address qualified as PV1 import Plutus.Script.Utils.V2.Address qualified as PV2 import Plutus.V1.Ledger.Api (Credential (PubKeyCredential, ScriptCredential), Datum, DatumHash, MintingPolicyHash, - POSIXTime, POSIXTimeRange, Redeemer, StakingCredential, TxOutRef, Validator, ValidatorHash) + PlutusLedgerApi.V1 POSIXTime, POSIXTimeRange, Redeemer, StakingCredential, TxOutRef, Validator, ValidatorHash) import Plutus.V1.Ledger.Interval qualified as I -import Plutus.V1.Ledger.Scripts (MintingPolicyHash (MintingPolicyHash), ScriptHash (ScriptHash), +import PlutusLedgerApi.V1.Scripts (MintingPolicyHash (MintingPolicyHash), ScriptHash (ScriptHash), ValidatorHash (ValidatorHash), unitRedeemer) -import Plutus.V1.Ledger.Value (TokenName, Value, isZero) -import Plutus.V1.Ledger.Value qualified as Value +import PlutusLedgerApi.V1.Value (TokenName, Value, isZero) +import PlutusLedgerApi.V1.Value qualified as Value import Control.Lens (At (at), (^.)) import Data.Function (const, flip) diff --git a/plutus-tx-constraints/test/Spec.hs b/plutus-tx-constraints/test/Spec.hs index b5e455a54b..ea4e7b2815 100644 --- a/plutus-tx-constraints/test/Spec.hs +++ b/plutus-tx-constraints/test/Spec.hs @@ -37,7 +37,7 @@ import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.V1.Generators qualified as Gen import Plutus.Script.Utils.Value (Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V1.Ledger.Api qualified as Ledger +import PlutusLedgerApi.V1 qualified as Ledger import PlutusTx qualified import PlutusTx.AssocMap qualified as AMap import Spec.Balancing qualified as Balancing diff --git a/plutus-use-cases/src/Plutus/Contracts/Crowdfunding.hs b/plutus-use-cases/src/Plutus/Contracts/Crowdfunding.hs index 645299e42c..709917a733 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Crowdfunding.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Crowdfunding.hs @@ -70,8 +70,8 @@ import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 hiding (validatorHas import Plutus.Trace.Effects.EmulatorControl (getSlotConfig) import Plutus.Trace.Emulator (ContractHandle, EmulatorTrace) import Plutus.Trace.Emulator qualified as Trace -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Prelude hiding (Applicative (..), Semigroup (..), return, (<$>), (>>), (>>=)) import Prelude (Semigroup (..), (<$>), (>>=)) diff --git a/plutus-use-cases/src/Plutus/Contracts/Currency.hs b/plutus-use-cases/src/Plutus/Contracts/Currency.hs index ae909b0d70..d77131d8ec 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Currency.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Currency.hs @@ -34,7 +34,7 @@ import Control.Monad (void) import Data.Aeson (FromJSON, ToJSON) import Data.Semigroup (Last (..)) import GHC.Generics (Generic) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.AssocMap qualified as AssocMap import PlutusTx.Prelude hiding (Monoid (..), Semigroup (..)) @@ -49,7 +49,7 @@ import Plutus.Contract.Request (getUnspentOutput) import Plutus.Script.Utils.V2.Scripts qualified as V2 import Plutus.Script.Utils.Value (CurrencySymbol, TokenName, Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Api qualified as V2 +import PlutusLedgerApi.V2 qualified as V2 import Prelude (Semigroup (..)) import Prelude qualified as Haskell diff --git a/plutus-use-cases/src/Plutus/Contracts/Escrow.hs b/plutus-use-cases/src/Plutus/Contracts/Escrow.hs index 4fb5310800..414003a000 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Escrow.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Escrow.hs @@ -71,9 +71,9 @@ import Plutus.Script.Utils.Scripts (datumHash) import Plutus.Script.Utils.V2.Contexts (ScriptContext (..), TxInfo (..), scriptOutputsAt, txInfoValidRange, txSignedBy) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value, geq, lt) -import Plutus.V2.Ledger.Api (Datum (Datum), DatumHash, ValidatorHash) -import Plutus.V2.Ledger.Contexts (valuePaidTo) -import Plutus.V2.Ledger.Tx (OutputDatum (OutputDatumHash)) +import PlutusLedgerApi.V2 (Datum (Datum), DatumHash, ValidatorHash) +import PlutusLedgerApi.V2.Contexts (valuePaidTo) +import PlutusLedgerApi.V2.Tx (OutputDatum (OutputDatumHash)) import Prelude (Semigroup (..), foldMap) import Prelude qualified as Haskell diff --git a/plutus-use-cases/src/Plutus/Contracts/Future.hs b/plutus-use-cases/src/Plutus/Contracts/Future.hs index 78195b1c42..d7caadebe3 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Future.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Future.hs @@ -64,7 +64,7 @@ import Plutus.Contract.Util (loopM) import Plutus.Script.Utils.V2.Address (mkValidatorAddress) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value as Value -import Plutus.V2.Ledger.Api (Datum (Datum), Validator, ValidatorHash) +import PlutusLedgerApi.V2 (Datum (Datum), Validator, ValidatorHash) import Plutus.Contract.StateMachine (AsSMContractError, State (..), StateMachine (..), Void) import Plutus.Contract.StateMachine qualified as SM diff --git a/plutus-use-cases/src/Plutus/Contracts/Game/Alonzo.hs b/plutus-use-cases/src/Plutus/Contracts/Game/Alonzo.hs index 47da38447e..acbb9dd7e3 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Game/Alonzo.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Game/Alonzo.hs @@ -60,8 +60,8 @@ import Plutus.Script.Utils.Typed (ScriptContextV2) import Plutus.Script.Utils.V2.Address (mkValidatorCardanoAddress) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value) -import Plutus.V2.Ledger.Api (Datum (Datum), Validator) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (Datum (Datum), Validator) +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Code (getCovIdx) import PlutusTx.Coverage (CoverageIndex) diff --git a/plutus-use-cases/src/Plutus/Contracts/Game/Babbage.hs b/plutus-use-cases/src/Plutus/Contracts/Game/Babbage.hs index 1c28ad517e..eb34fc2266 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Game/Babbage.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Game/Babbage.hs @@ -64,8 +64,8 @@ import Plutus.Script.Utils.Typed (ScriptContextV2, validatorHash) import Plutus.Script.Utils.V2.Address (mkValidatorCardanoAddress) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value) -import Plutus.V2.Ledger.Api (Address, Datum (Datum), Validator) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (Address, Datum (Datum), Validator) +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Code (getCovIdx) import PlutusTx.Coverage (CoverageIndex) diff --git a/plutus-use-cases/src/Plutus/Contracts/MultiSig.hs b/plutus-use-cases/src/Plutus/Contracts/MultiSig.hs index 7ea4cd2312..aaf621edb2 100644 --- a/plutus-use-cases/src/Plutus/Contracts/MultiSig.hs +++ b/plutus-use-cases/src/Plutus/Contracts/MultiSig.hs @@ -32,8 +32,8 @@ import Ledger.Tx.Constraints qualified as Constraints import Ledger.Typed.Scripts qualified as Scripts import Plutus.Contract import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 -import Plutus.V2.Ledger.Api as Plutus (Value) -import Plutus.V2.Ledger.Contexts as V2 +import PlutusLedgerApi.V2 as Plutus (Value) +import PlutusLedgerApi.V2.Contexts as V2 import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), foldMap) diff --git a/plutus-use-cases/src/Plutus/Contracts/Prism/Credential.hs b/plutus-use-cases/src/Plutus/Contracts/Prism/Credential.hs index d1740b6c1f..b43d55b34f 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Prism/Credential.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Prism/Credential.hs @@ -25,8 +25,8 @@ import Plutus.Script.Utils.Typed qualified as Scripts import Plutus.Script.Utils.V2.Scripts (mintingPolicyHash) import Plutus.Script.Utils.Value (TokenName, Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Api (MintingPolicy, ScriptContext (..), mkMintingPolicyScript) -import Plutus.V2.Ledger.Contexts (txSignedBy) +import PlutusLedgerApi.V2 (MintingPolicy, ScriptContext (..), mkMintingPolicyScript) +import PlutusLedgerApi.V2.Contexts (txSignedBy) import PlutusTx qualified import PlutusTx.Prelude import Prelude qualified as Haskell diff --git a/plutus-use-cases/src/Plutus/Contracts/Prism/STO.hs b/plutus-use-cases/src/Plutus/Contracts/Prism/STO.hs index 858c28ddc6..b41f4ea057 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Prism/STO.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Prism/STO.hs @@ -36,8 +36,8 @@ import Plutus.Script.Utils.Typed qualified as Scripts import Plutus.Script.Utils.V2.Scripts qualified as V2 import Plutus.Script.Utils.Value (TokenName, Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Api (MintingPolicy, ScriptContext (..), ScriptPurpose (..), mkMintingPolicyScript) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (MintingPolicy, ScriptContext (..), ScriptPurpose (..), mkMintingPolicyScript) +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Prelude import Prelude qualified as Haskell diff --git a/plutus-use-cases/src/Plutus/Contracts/PubKey.hs b/plutus-use-cases/src/Plutus/Contracts/PubKey.hs index 8005a08b46..4ff8e85e11 100644 --- a/plutus-use-cases/src/Plutus/Contracts/PubKey.hs +++ b/plutus-use-cases/src/Plutus/Contracts/PubKey.hs @@ -31,8 +31,8 @@ import Ledger.Typed.Scripts qualified as Scripts import Plutus.ChainIndex.Types (Tip (Tip, TipAtGenesis)) import Plutus.Contract as Contract import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 -import Plutus.V2.Ledger.Api (Value) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (Value) +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified mkValidator :: PaymentPubKeyHash -> () -> () -> V2.ScriptContext -> Bool diff --git a/plutus-use-cases/src/Plutus/Contracts/SimpleEscrow.hs b/plutus-use-cases/src/Plutus/Contracts/SimpleEscrow.hs index 02c22d4f0c..60e4f23735 100644 --- a/plutus-use-cases/src/Plutus/Contracts/SimpleEscrow.hs +++ b/plutus-use-cases/src/Plutus/Contracts/SimpleEscrow.hs @@ -34,9 +34,9 @@ import Ledger.Typed.Scripts (ScriptContextV2) import Ledger.Typed.Scripts qualified as Scripts import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value, geq) -import Plutus.V2.Ledger.Api (txInfoValidRange) -import Plutus.V2.Ledger.Contexts (txSignedBy, valuePaidTo) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (txInfoValidRange) +import PlutusLedgerApi.V2.Contexts (txSignedBy, valuePaidTo) +import PlutusLedgerApi.V2.Contexts qualified as V2 import Plutus.Contract import PlutusTx qualified diff --git a/plutus-use-cases/src/Plutus/Contracts/Swap.hs b/plutus-use-cases/src/Plutus/Contracts/Swap.hs index 1acbc4523f..837abf766d 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Swap.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Swap.hs @@ -23,9 +23,9 @@ import Plutus.Contract.Oracle qualified as Oracle import Plutus.Script.Utils.Ada (Ada) import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value (Value) -import Plutus.V1.Ledger.Address (toPubKeyHash) -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V1.Address (toPubKeyHash) +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Prelude diff --git a/plutus-use-cases/src/Plutus/Contracts/TokenAccount.hs b/plutus-use-cases/src/Plutus/Contracts/TokenAccount.hs index d4e4fcca2d..3366c006fc 100644 --- a/plutus-use-cases/src/Plutus/Contracts/TokenAccount.hs +++ b/plutus-use-cases/src/Plutus/Contracts/TokenAccount.hs @@ -61,8 +61,8 @@ import Plutus.Script.Utils.V2.Address (mkValidatorCardanoAddress) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (AssetClass, TokenName, Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Api qualified as V2 -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 qualified as V2 +import PlutusLedgerApi.V2.Contexts qualified as V2 import Prettyprinter.Extras (PrettyShow (PrettyShow)) diff --git a/plutus-use-cases/src/Plutus/Contracts/Tutorial/Escrow.hs b/plutus-use-cases/src/Plutus/Contracts/Tutorial/Escrow.hs index ad08bd8c98..dd43f383a2 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Tutorial/Escrow.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Tutorial/Escrow.hs @@ -60,8 +60,8 @@ import Ledger.Typed.Scripts qualified as Scripts import Plutus.Script.Utils.V2.Contexts (ScriptContext (..), TxInfo (..), txSignedBy) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value, geq, lt) -import Plutus.V2.Ledger.Api (Datum (Datum), DatumHash) -import Plutus.V2.Ledger.Contexts (valuePaidTo) +import PlutusLedgerApi.V2 (Datum (Datum), DatumHash) +import PlutusLedgerApi.V2.Contexts (valuePaidTo) import Cardano.Node.Emulator.Internal.Node.Params qualified as Params import Plutus.Contract diff --git a/plutus-use-cases/src/Plutus/Contracts/Tutorial/EscrowStrict.hs b/plutus-use-cases/src/Plutus/Contracts/Tutorial/EscrowStrict.hs index a2094260e2..aefb7bdec9 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Tutorial/EscrowStrict.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Tutorial/EscrowStrict.hs @@ -57,9 +57,9 @@ import Ledger.Typed.Scripts qualified as Scripts import Plutus.Script.Utils.V2.Contexts (ScriptContext (..), TxInfo (..), scriptOutputsAt, txSignedBy) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value, geq, lt) -import Plutus.V2.Ledger.Api (Datum (Datum), DatumHash, ValidatorHash) -import Plutus.V2.Ledger.Contexts (valuePaidTo) -import Plutus.V2.Ledger.Tx (OutputDatum (OutputDatumHash)) +import PlutusLedgerApi.V2 (Datum (Datum), DatumHash, ValidatorHash) +import PlutusLedgerApi.V2.Contexts (valuePaidTo) +import PlutusLedgerApi.V2.Tx (OutputDatum (OutputDatumHash)) import Cardano.Node.Emulator.Internal.Node.Params qualified as Params import Plutus.Contract diff --git a/plutus-use-cases/src/Plutus/Contracts/Uniswap/OffChain.hs b/plutus-use-cases/src/Plutus/Contracts/Uniswap/OffChain.hs index 51218719b2..6aeb7695cc 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Uniswap/OffChain.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Uniswap/OffChain.hs @@ -58,9 +58,9 @@ import Plutus.Contracts.Uniswap.Types import Plutus.Script.Utils.V2.Address (mkValidatorCardanoAddress) import Plutus.Script.Utils.V2.Scripts (scriptCurrencySymbol) import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 -import Plutus.V2.Ledger.Api (CurrencySymbol, Datum (Datum), DatumHash, MintingPolicy, Redeemer (Redeemer), TokenName, +import PlutusLedgerApi.V2 (CurrencySymbol, Datum (Datum), DatumHash, MintingPolicy, Redeemer (Redeemer), TokenName, TxOutRef, Validator, Value) -import Plutus.V2.Ledger.Api qualified as V2 +import PlutusLedgerApi.V2 qualified as V2 import PlutusTx qualified import PlutusTx.Coverage import PlutusTx.Prelude hiding (Semigroup (..), dropWhile, flip, unless) diff --git a/plutus-use-cases/src/Plutus/Contracts/Uniswap/OnChain.hs b/plutus-use-cases/src/Plutus/Contracts/Uniswap/OnChain.hs index 6e11f0848b..1a835024ff 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Uniswap/OnChain.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Uniswap/OnChain.hs @@ -24,10 +24,10 @@ import Plutus.Contracts.Uniswap.Pool (calculateAdditionalLiquidity, calculateIni checkSwap, lpTicker) import Plutus.Contracts.Uniswap.Types import Plutus.Script.Utils.Value (AssetClass (..), symbols) -import Plutus.V2.Ledger.Api (Datum (Datum), DatumHash, OutputDatum (..), ScriptContext (..), TokenName, +import PlutusLedgerApi.V2 (Datum (Datum), DatumHash, OutputDatum (..), ScriptContext (..), TokenName, TxInInfo (txInInfoResolved), TxInfo (txInfoInputs, txInfoMint), TxOut (txOutDatum, txOutValue), Value) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Prelude diff --git a/plutus-use-cases/src/Plutus/Contracts/Vesting.hs b/plutus-use-cases/src/Plutus/Contracts/Vesting.hs index 80c47c6fa2..d8ef6e486e 100644 --- a/plutus-use-cases/src/Plutus/Contracts/Vesting.hs +++ b/plutus-use-cases/src/Plutus/Contracts/Vesting.hs @@ -46,8 +46,8 @@ import Plutus.Contract import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2 import Plutus.Script.Utils.Value (Value) import Plutus.Script.Utils.Value qualified as Value -import Plutus.V2.Ledger.Api (ScriptContext (..), TxInfo (..), Validator) -import Plutus.V2.Ledger.Contexts qualified as V2 +import PlutusLedgerApi.V2 (ScriptContext (..), TxInfo (..), Validator) +import PlutusLedgerApi.V2.Contexts qualified as V2 import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), fold) import Prelude qualified as Haskell diff --git a/plutus-use-cases/test/Spec/Currency.hs b/plutus-use-cases/test/Spec/Currency.hs index eab54052f3..75c2ce38fe 100644 --- a/plutus-use-cases/test/Spec/Currency.hs +++ b/plutus-use-cases/test/Spec/Currency.hs @@ -5,12 +5,12 @@ module Spec.Currency(tests, currencyTrace) where import Control.Monad (void) import Plutus.Contract import Plutus.Contract.Test -import Plutus.V1.Ledger.Scripts (scriptSize) +import PlutusLedgerApi.V1.Scripts (scriptSize) import Plutus.Contracts.Currency (OneShotCurrency) import Plutus.Contracts.Currency qualified as Cur import Plutus.Trace.Emulator qualified as Trace -import Plutus.V2.Ledger.Api qualified as V2 +import PlutusLedgerApi.V2 qualified as V2 import Test.Tasty diff --git a/plutus-use-cases/test/Spec/Escrow/Endpoints.hs b/plutus-use-cases/test/Spec/Escrow/Endpoints.hs index 42b2054efb..fb0195de7c 100644 --- a/plutus-use-cases/test/Spec/Escrow/Endpoints.hs +++ b/plutus-use-cases/test/Spec/Escrow/Endpoints.hs @@ -21,7 +21,7 @@ import Ledger.Typed.Scripts (TypedValidator) import Ledger.Typed.Scripts qualified as Scripts import Plutus.Contract import Plutus.Script.Utils.Scripts qualified as Ledger -import Plutus.V2.Ledger.Api (Datum (Datum)) +import PlutusLedgerApi.V2 (Datum (Datum)) import PlutusTx qualified import PlutusTx.Prelude hiding (Applicative (..), Semigroup (..), check, foldMap) diff --git a/plutus-use-cases/test/Spec/Tutorial/Escrow.hs b/plutus-use-cases/test/Spec/Tutorial/Escrow.hs index 8dfeeffd28..8b334db30d 100644 --- a/plutus-use-cases/test/Spec/Tutorial/Escrow.hs +++ b/plutus-use-cases/test/Spec/Tutorial/Escrow.hs @@ -29,7 +29,7 @@ import Plutus.Contract.Test.ContractModel import Plutus.Contract.Test.ContractModel.CrashTolerance import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value -import Plutus.V2.Ledger.Api (Datum) +import PlutusLedgerApi.V2 (Datum) import Plutus.Contracts.Tutorial.Escrow hiding (Action (..)) import Plutus.Trace.Emulator qualified as Trace diff --git a/plutus-use-cases/test/Spec/Tutorial/Escrow2.hs b/plutus-use-cases/test/Spec/Tutorial/Escrow2.hs index cd9cfca106..5ea44c3688 100644 --- a/plutus-use-cases/test/Spec/Tutorial/Escrow2.hs +++ b/plutus-use-cases/test/Spec/Tutorial/Escrow2.hs @@ -28,7 +28,7 @@ import Plutus.Contract.Test import Plutus.Contract.Test.ContractModel import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value -import Plutus.V2.Ledger.Api (Datum) +import PlutusLedgerApi.V2 (Datum) import Plutus.Contracts.Tutorial.Escrow hiding (Action (..)) import Plutus.Trace.Emulator qualified as Trace diff --git a/plutus-use-cases/test/Spec/Tutorial/Escrow3.hs b/plutus-use-cases/test/Spec/Tutorial/Escrow3.hs index 43c296aca1..7ae65a064e 100644 --- a/plutus-use-cases/test/Spec/Tutorial/Escrow3.hs +++ b/plutus-use-cases/test/Spec/Tutorial/Escrow3.hs @@ -28,7 +28,7 @@ import Plutus.Contract.Test import Plutus.Contract.Test.ContractModel import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value -import Plutus.V2.Ledger.Api (Datum) +import PlutusLedgerApi.V2 (Datum) import Plutus.Contracts.Tutorial.Escrow hiding (Action (..)) import Plutus.Trace.Emulator qualified as Trace diff --git a/plutus-use-cases/test/Spec/Tutorial/Escrow4.hs b/plutus-use-cases/test/Spec/Tutorial/Escrow4.hs index 8e8689ec17..b79e50dfa7 100644 --- a/plutus-use-cases/test/Spec/Tutorial/Escrow4.hs +++ b/plutus-use-cases/test/Spec/Tutorial/Escrow4.hs @@ -30,7 +30,7 @@ import Plutus.Contract.Test import Plutus.Contract.Test.ContractModel import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value (Value, geq) -import Plutus.V2.Ledger.Api (Datum, POSIXTime (POSIXTime)) +import PlutusLedgerApi.V2 (Datum, POSIXTime (POSIXTime)) import Plutus.Contracts.Escrow hiding (Action (..)) import Plutus.Trace.Emulator qualified as Trace diff --git a/plutus-use-cases/test/Spec/Tutorial/Escrow5.hs b/plutus-use-cases/test/Spec/Tutorial/Escrow5.hs index 0a1e873339..57c8524030 100644 --- a/plutus-use-cases/test/Spec/Tutorial/Escrow5.hs +++ b/plutus-use-cases/test/Spec/Tutorial/Escrow5.hs @@ -31,7 +31,7 @@ import Plutus.Contract.Test import Plutus.Contract.Test.ContractModel import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value (Value, geq) -import Plutus.V2.Ledger.Api (Datum, POSIXTime (POSIXTime)) +import PlutusLedgerApi.V2 (Datum, POSIXTime (POSIXTime)) import Plutus.Contracts.Escrow hiding (Action (..)) import Plutus.Trace.Emulator qualified as Trace diff --git a/plutus-use-cases/test/Spec/Tutorial/Escrow6.hs b/plutus-use-cases/test/Spec/Tutorial/Escrow6.hs index ae416ecac7..30a4bc7ecc 100644 --- a/plutus-use-cases/test/Spec/Tutorial/Escrow6.hs +++ b/plutus-use-cases/test/Spec/Tutorial/Escrow6.hs @@ -33,7 +33,7 @@ import Plutus.Contract.Test.ContractModel import Plutus.Contract.Test.ContractModel.CrashTolerance import Plutus.Script.Utils.Ada qualified as Ada import Plutus.Script.Utils.Value (Value, geq) -import Plutus.V2.Ledger.Api (Datum, POSIXTime (POSIXTime)) +import PlutusLedgerApi.V2 (Datum, POSIXTime (POSIXTime)) import Plutus.Contracts.Escrow hiding (Action (..)) import Plutus.Trace.Emulator qualified as Trace diff --git a/plutus-use-cases/test/Spec/Uniswap/Endpoints.hs b/plutus-use-cases/test/Spec/Uniswap/Endpoints.hs index b4e65fd950..81f18bdfc4 100644 --- a/plutus-use-cases/test/Spec/Uniswap/Endpoints.hs +++ b/plutus-use-cases/test/Spec/Uniswap/Endpoints.hs @@ -23,7 +23,7 @@ import Plutus.Contract as Contract import Plutus.Contracts.Currency () import Plutus.Contracts.Uniswap.Pool import Plutus.Contracts.Uniswap.Types -import Plutus.V2.Ledger.Api (Redeemer (Redeemer)) +import PlutusLedgerApi.V2 (Redeemer (Redeemer)) import PlutusTx qualified import PlutusTx.Prelude hiding (Semigroup (..), dropWhile, flip, unless) import Prelude as Haskell (Semigroup (..), Show, show) From 390c8ac51b7e8787cd10300da45dbdbed16727ea Mon Sep 17 00:00:00 2001 From: Sjoerd Visscher Date: Thu, 27 Jul 2023 16:44:07 +0200 Subject: [PATCH 06/18] WIP --- cabal.project | 140 ++---------------------------- nix/pkgs/haskell/extra.nix | 2 +- plutus-ledger/plutus-ledger.cabal | 35 ++++---- 3 files changed, 27 insertions(+), 150 deletions(-) diff --git a/cabal.project b/cabal.project index 66fd2b21d9..cc2771c640 100644 --- a/cabal.project +++ b/cabal.project @@ -13,29 +13,11 @@ repository cardano-haskell-packages -- See CONTRIBUTING.adoc for how to update index-state index-state: - , hackage.haskell.org 2023-07-27T00:00:00Z - , cardano-haskell-packages 2023-07-27T00:00:00Z + , hackage.haskell.org 2023-07-10T00:00:00Z + , cardano-haskell-packages 2023-07-10T00:00:00Z -packages: cardano-node-emulator - cardano-node-socket-emulator - cardano-streaming - doc - freer-extras - marconi-chain-index - marconi-core - pab-blockfrost - plutus-chain-index - plutus-chain-index-core - plutus-contract - plutus-contract-certification - plutus-contract-model - plutus-example - plutus-ledger - plutus-pab - plutus-pab-executables +packages: plutus-ledger plutus-script-utils - plutus-tx-constraints - plutus-use-cases -- We never, ever, want this. write-ghc-environment-files: never @@ -54,121 +36,17 @@ allow-newer: -- trustees can make a revision to these packages cabal file to solve the -- issue permanently. , ekg:aeson - , ekg-json:aeson + , ekg-json:* , openapi3:aeson , servant:aeson , servant-client-core:aeson , servant-server:aeson , servant-foreign:lens , blockfrost-api:lens - -- temporary - , quickcheck-contractmodel:* + , ghcide:* constraints: - -- cardano-wallet needs - , cardano-api ^>=8.2 - , cardano-slotting >= 0.1 - , ouroboros-network ^>= 0.8.1.0 - - -- cardano-prelude-0.1.0.0 needs - -- , protolude <0.3.1 - - -- cardano-ledger-byron-0.1.0.0 needs - -- , cardano-binary <1.5.0.1 - - -- plutus-core-1.0.0.1 needs - -- , cardano-crypto-class >2.0.0.0 - -- , algebraic-graphs <0.7 - - -- cardano-ledger-core-0.1.0.0 needs - -- , cardano-crypto-class <2.0.0.1 - - -- cardano-crypto-class-2.0.0.0.1 needs - -- , cardano-prelude <0.1.0.1 - - -- dbvar from cardano-wallet needs - -- , io-classes <0.3.0.0 - - -- newer typed-protocols need io-classes>=0.3.0.0 which is incompatible with dbvar's constraint above - -- , typed-protocols==0.1.0.0 - - -- , aeson >= 2 - - -- , hedgehog >= 1.1 - - -- , resource-pool <0.4.0.0 - - -- , http2 <4.0.0 - - -- ouroboros-consensus-shelley-0.1.0.1 needs - -- , ouroboros-consensus-protocol==0.1.0.1 - --- The plugin will typically fail when producing Haddock documentation. However, --- in this instance you can simply tell it to defer any errors to runtime (which --- will never happen since you're building documentation). --- --- So, any package using 'PlutusTx.compile' in the code for which you need to --- generate haddock documentation should use the following 'haddock-options'. -package plutus-ledger - haddock-options: "--optghc=-fplugin-opt PlutusTx.Plugin:defer-errors" -package plutus-script-utils - haddock-options: "--optghc=-fplugin-opt PlutusTx.Plugin:defer-errors" -package plutus-contract - haddock-options: "--optghc=-fplugin-opt PlutusTx.Plugin:defer-errors" -package plutus-contract-model - haddock-options: "--optghc=-fplugin-opt PlutusTx.Plugin:defer-errors" - --- These packages appear in our dependency tree and are very slow to build. --- Empirically, turning off optimization shaves off ~50% build time. --- It also mildly improves recompilation avoidance. --- For dev work we don't care about performance so much, so this is okay. -package cardano-ledger-alonzo - optimization: False -package ouroboros-consensus-shelley - optimization: False -package ouroboros-consensus-cardano - optimization: False -package cardano-api - optimization: False -package cardano-wallet - optimization: False -package cardano-wallet-core - optimization: False -package cardano-wallet-cli - optimization: False -package cardano-wallet-launcher - optimization: False -package cardano-wallet-core-integration - optimization: False - -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-wallet - tag: 3f0d2f3abe706958fab8cdc528184068bd0453c9 - --sha256: 1xbr5qrz716mh3vhng64m4v6zhp03x5lcf0kld5mmm1yij0fadwa - subdir: - -- lib/balance-tx - -- lib/coin-selection - -- lib/delta-store - -- lib/delta-table - -- lib/delta-types - -- lib/launcher - -- lib/numeric - -- lib/primitive - -- lib/test-utils - lib/text-class - -- lib/wai-middleware-logging - lib/wallet - -- lib/wallet-benchmarks - --- Should follow cardano-wallet. -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-addresses - tag: 6b55f96d57a181f898eb2a50531d3ae4280c549c - --sha256: 0yygam995i3mawk6hfgxb6v918phvqzyipzhjflff0l6zfrldy7f - subdir: - -- cardano-addresses-cli - command-line - -- cardano-addresses - core + ghc == 9.2.8 + , ghcide == 1.10 + , ghc-typelits-knownnat == 0.7.7 + , ghc-typelits-natnormalise == 0.7.7 \ No newline at end of file diff --git a/nix/pkgs/haskell/extra.nix b/nix/pkgs/haskell/extra.nix index 23ce5da405..0aa1f34a5d 100644 --- a/nix/pkgs/haskell/extra.nix +++ b/nix/pkgs/haskell/extra.nix @@ -53,7 +53,7 @@ let # b) Pull out the tools themselves from the HLS project so we can use # them elsewhere cabalProjectLocal = '' - constraints: stylish-haskell==0.13.0.0, hlint==3.2.8 + constraints: stylish-haskell==0.14.2.0, hlint==3.4.1 ''; src = sources.haskell-language-server; diff --git a/plutus-ledger/plutus-ledger.cabal b/plutus-ledger/plutus-ledger.cabal index 46576aa274..1cff90f572 100644 --- a/plutus-ledger/plutus-ledger.cabal +++ b/plutus-ledger/plutus-ledger.cabal @@ -114,24 +114,24 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api ^>=8.2 + , cardano-api ^>=8.2 , cardano-binary - , cardano-crypto - , cardano-crypto-class - , cardano-ledger-alonzo - , cardano-ledger-babbage - , cardano-ledger-byron - , cardano-ledger-core - , cardano-ledger-shelley - , cardano-ledger-shelley-ma , cardano-slotting , data-default , iohk-monitoring - , ouroboros-consensus-shelley - , plutus-core >=1.0.0 - , plutus-ledger-api >=1.0.0 - , plutus-tx >=1.0.0 - + , plutus-core >=1.0.0 + , plutus-ledger-api >=1.0.0 + , plutus-tx >=1.0.0 + + -- , cardano-crypto + -- , cardano-crypto-class + -- , cardano-ledger-alonzo + -- , cardano-ledger-babbage + -- , cardano-ledger-byron + -- , cardano-ledger-core + -- , cardano-ledger-shelley + -- , cardano-ledger-shelley-ma + -- , ouroboros-consensus-shelley ------------------------ -- Non-IOG dependencies ------------------------ @@ -140,12 +140,12 @@ library -- defined there. build-depends: , aeson - , base >=4.9 && <5 + , base >=4.9 && <5 , base16-bytestring , bytestring , cborg , containers - , cryptonite >=0.25 + , cryptonite >=0.25 , flat , hashable , http-api-data @@ -154,7 +154,6 @@ library , mtl , newtype-generics , prettyprinter - , quickcheck-contractmodel >=0.1.4.0 , scientific , serialise , servant @@ -196,10 +195,10 @@ test-suite plutus-ledger-test -------------------------- build-depends: , cardano-api:{cardano-api, gen} ^>=8.2 - , cardano-crypto-class >=2.0.0 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 + -- , cardano-crypto-class >=2.0.0 ------------------------ -- Non-IOG dependencies ------------------------ From 2c8decff08bdfd98913bd9b46e0118968f9ece31 Mon Sep 17 00:00:00 2001 From: Sjoerd Visscher Date: Tue, 1 Aug 2023 14:12:24 +0200 Subject: [PATCH 07/18] Replace strict-containers with cardano-strict-containers --- cardano-node-emulator/cardano-node-emulator.cabal | 8 ++++---- .../cardano-node-socket-emulator.cabal | 2 +- plutus-contract/plutus-contract.cabal | 12 ++++++------ plutus-example/plutus-example.cabal | 2 +- plutus-ledger/plutus-ledger.cabal | 6 +++--- plutus-use-cases/plutus-use-cases.cabal | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cardano-node-emulator/cardano-node-emulator.cabal b/cardano-node-emulator/cardano-node-emulator.cabal index 47f9b4a31f..a9b10aa070 100644 --- a/cardano-node-emulator/cardano-node-emulator.cabal +++ b/cardano-node-emulator/cardano-node-emulator.cabal @@ -71,10 +71,11 @@ library -- Non-IOG dependencies ------------------------ build-depends: - , aeson >=2 + , aeson >=2 , array - , base >=4.9 && <5 + , base >=4.9 && <5 , bytestring + , cardano-strict-containers , containers , data-default , either @@ -82,11 +83,10 @@ library , hedgehog , lens , mtl - , prettyprinter >=1.1.0.1 + , prettyprinter >=1.1.0.1 , QuickCheck , quickcheck-dynamic , serialise - , strict-containers , text , time diff --git a/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal b/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal index ce1feed1be..87d3a264c0 100644 --- a/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal +++ b/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal @@ -55,6 +55,7 @@ library , cardano-ledger-shelley , cardano-ledger-shelley-ma , cardano-slotting + , cardano-strict-containers , cryptonite , exceptions , io-classes @@ -72,7 +73,6 @@ library , plutus-tx >=1.0.0 , quickcheck-contractmodel >=0.1.4.0 , serialise - , strict-containers , text-class , typed-protocols diff --git a/plutus-contract/plutus-contract.cabal b/plutus-contract/plutus-contract.cabal index 3dcdd2aee5..d0970b2eb2 100644 --- a/plutus-contract/plutus-contract.cabal +++ b/plutus-contract/plutus-contract.cabal @@ -146,12 +146,13 @@ library -- Non-IOG dependencies ------------------------ build-depends: - , aeson >=2 + , aeson >=2 , aeson-pretty - , base >=4.7 && <5 + , base >=4.7 && <5 , bytestring + , cardano-strict-containers , containers - , cryptonite >=0.25 + , cryptonite >=0.25 , data-default , directory , filepath @@ -167,16 +168,15 @@ library , mmorph , mtl , pretty - , prettyprinter >=1.1.0.1 + , prettyprinter >=1.1.0.1 , profunctors , QuickCheck - , row-types >=1.0.1.0 + , row-types >=1.0.1.0 , semigroupoids , serialise , servant , stm , streaming - , strict-containers , template-haskell , text , text-class diff --git a/plutus-example/plutus-example.cabal b/plutus-example/plutus-example.cabal index c9f8e44211..7de9d5f59e 100644 --- a/plutus-example/plutus-example.cabal +++ b/plutus-example/plutus-example.cabal @@ -97,9 +97,9 @@ library build-depends: , aeson , bytestring + , cardano-strict-containers , containers , serialise - , strict-containers , text , transformers , transformers-except diff --git a/plutus-ledger/plutus-ledger.cabal b/plutus-ledger/plutus-ledger.cabal index 1cff90f572..c3c21208f5 100644 --- a/plutus-ledger/plutus-ledger.cabal +++ b/plutus-ledger/plutus-ledger.cabal @@ -140,12 +140,13 @@ library -- defined there. build-depends: , aeson - , base >=4.9 && <5 + , base >=4.9 && <5 , base16-bytestring , bytestring + , cardano-strict-containers , cborg , containers - , cryptonite >=0.25 + , cryptonite >=0.25 , flat , hashable , http-api-data @@ -157,7 +158,6 @@ library , scientific , serialise , servant - , strict-containers , tagged , template-haskell , text diff --git a/plutus-use-cases/plutus-use-cases.cabal b/plutus-use-cases/plutus-use-cases.cabal index 627a6fb561..2796af4745 100644 --- a/plutus-use-cases/plutus-use-cases.cabal +++ b/plutus-use-cases/plutus-use-cases.cabal @@ -220,8 +220,9 @@ test-suite plutus-use-cases-test ------------------------ build-depends: aeson - , base >=4.9 && <5 + , base >=4.9 && <5 , bytestring + , cardano-strict-containers , containers , data-default , foldl @@ -233,10 +234,9 @@ test-suite plutus-use-cases-test , prettyprinter , QuickCheck , streaming - , strict-containers , tasty , tasty-golden - , tasty-hedgehog >=0.2.0.0 + , tasty-hedgehog >=0.2.0.0 , tasty-hunit , tasty-quickcheck , text From bd6df3cd16613d7514649a1a704208425b26df2a Mon Sep 17 00:00:00 2001 From: Sjoerd Visscher Date: Thu, 3 Aug 2023 12:46:53 +0200 Subject: [PATCH 08/18] WIP --- plutus-ledger/plutus-ledger.cabal | 1 - plutus-script-utils/plutus-script-utils.cabal | 1 + .../src/Plutus/Script/Utils/Scripts.hs | 106 ++++++++++++++---- .../src/Plutus/Script/Utils/V1/Scripts.hs | 5 +- .../src/Plutus/Script/Utils/Value.hs | 17 ++- .../src/Prettyprinter/Extras.hs | 8 +- 6 files changed, 109 insertions(+), 29 deletions(-) rename {plutus-ledger => plutus-script-utils}/src/Prettyprinter/Extras.hs (86%) diff --git a/plutus-ledger/plutus-ledger.cabal b/plutus-ledger/plutus-ledger.cabal index c3c21208f5..3e78495e60 100644 --- a/plutus-ledger/plutus-ledger.cabal +++ b/plutus-ledger/plutus-ledger.cabal @@ -89,7 +89,6 @@ library Ledger.Typed.TypeUtils Ledger.Value.CardanoAPI Ledger.Value.Orphans - Prettyprinter.Extras reexported-modules: PlutusLedgerApi.V1.Bytes as Ledger.Bytes, diff --git a/plutus-script-utils/plutus-script-utils.cabal b/plutus-script-utils/plutus-script-utils.cabal index 8d1c194c11..7f95525231 100644 --- a/plutus-script-utils/plutus-script-utils.cabal +++ b/plutus-script-utils/plutus-script-utils.cabal @@ -79,6 +79,7 @@ library Plutus.Script.Utils.V2.Typed.Scripts.StakeValidators Plutus.Script.Utils.V2.Typed.Scripts.Validators Plutus.Script.Utils.Value + Prettyprinter.Extras -------------------------- -- Other IOG dependencies diff --git a/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs b/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs index ea6df9ec7d..ce4373d2ee 100644 --- a/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs +++ b/plutus-script-utils/src/Plutus/Script/Utils/Scripts.hs @@ -1,4 +1,5 @@ {-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE DerivingVia #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} @@ -13,7 +14,14 @@ module Plutus.Script.Utils.Scripts ( -- * Plutus language versioning Language (..) , Versioned (..) + , Script (..) + , Validator (..) + , MintingPolicy (..) + , StakeValidator (..) -- * Script hashing + , ValidatorHash (..) + , MintingPolicyHash (..) + , StakeValidatorHash (..) , scriptHash , validatorHash , mintingPolicyHash @@ -32,22 +40,25 @@ module Plutus.Script.Utils.Scripts import Cardano.Api qualified as C.Api import Cardano.Api.Shelley qualified as C.Api -import Cardano.Ledger.Alonzo.Language (Language (PlutusV1, PlutusV2)) +import Cardano.Ledger.Alonzo.Language (Language (PlutusV1, PlutusV2, PlutusV3)) import Codec.Serialise (Serialise, serialise) import Data.Aeson (FromJSON, ToJSON) import Data.ByteString.Lazy qualified as BSL import Data.ByteString.Short qualified as SBS +import Data.String (IsString) import GHC.Generics (Generic) import PlutusLedgerApi.V1 qualified as PV1 -import PlutusLedgerApi.V1.Scripts qualified as PV1 +import PlutusLedgerApi.V1.Bytes (LedgerBytes (LedgerBytes)) import PlutusTx.Builtins qualified as Builtins import Prettyprinter (Pretty (pretty)) +import Prettyprinter.Extras (PrettyShow(PrettyShow)) deriving instance Serialise Language instance Pretty Language where pretty PlutusV1 = "Plutus V1" pretty PlutusV2 = "Plutus V2" + pretty PlutusV3 = "Plutus V3" -- | A script of some kind with its Plutus language version data Versioned script = Versioned { unversioned :: script, version :: Language } @@ -58,7 +69,7 @@ instance Pretty script => Pretty (Versioned script) where pretty Versioned{unversioned,version} = pretty unversioned <> " (" <> pretty version <> ")" -- | Hash a 'Versioned' 'Script' -scriptHash :: Versioned PV1.Script -> PV1.ScriptHash +scriptHash :: Versioned Script -> PV1.ScriptHash scriptHash (Versioned script lang) = PV1.ScriptHash . Builtins.toBuiltin @@ -71,36 +82,37 @@ scriptHash (Versioned script lang) = where hashInner PlutusV1 = C.Api.hashScript . C.Api.PlutusScript C.Api.PlutusScriptV1 . C.Api.PlutusScriptSerialised hashInner PlutusV2 = C.Api.hashScript . C.Api.PlutusScript C.Api.PlutusScriptV2 . C.Api.PlutusScriptSerialised + hashInner PlutusV3 = C.Api.hashScript . C.Api.PlutusScript C.Api.PlutusScriptV3 . C.Api.PlutusScriptSerialised --- | Hash a 'Versioned' 'PV1.Validator' script. -validatorHash :: Versioned PV1.Validator -> PV1.ValidatorHash +-- | Hash a 'Versioned' 'Validator' script. +validatorHash :: Versioned Validator -> ValidatorHash validatorHash = - PV1.ValidatorHash + ValidatorHash . PV1.getScriptHash . scriptHash - . fmap PV1.getValidator + . fmap getValidator --- | Hash a 'Versioned' 'PV1.MintingPolicy' script. -mintingPolicyHash :: Versioned PV1.MintingPolicy -> PV1.MintingPolicyHash +-- | Hash a 'Versioned' 'MintingPolicy' script. +mintingPolicyHash :: Versioned MintingPolicy -> MintingPolicyHash mintingPolicyHash = - PV1.MintingPolicyHash + MintingPolicyHash . PV1.getScriptHash . scriptHash - . fmap PV1.getMintingPolicy + . fmap getMintingPolicy --- | Hash a 'Versioned' 'PV1.StakeValidator' script. -stakeValidatorHash :: Versioned PV1.StakeValidator -> PV1.StakeValidatorHash +-- | Hash a 'Versioned' 'StakeValidator' script. +stakeValidatorHash :: Versioned StakeValidator -> StakeValidatorHash stakeValidatorHash = - PV1.StakeValidatorHash + StakeValidatorHash . PV1.getScriptHash . scriptHash - . fmap PV1.getStakeValidator + . fmap getStakeValidator {-# INLINABLE scriptCurrencySymbol #-} -- | The 'CurrencySymbol' of a 'MintingPolicy'. -scriptCurrencySymbol :: Versioned PV1.MintingPolicy -> PV1.CurrencySymbol +scriptCurrencySymbol :: Versioned MintingPolicy -> PV1.CurrencySymbol scriptCurrencySymbol scrpt = - let (PV1.MintingPolicyHash hsh) = mintingPolicyHash scrpt in PV1.CurrencySymbol hsh + let (MintingPolicyHash hsh) = mintingPolicyHash scrpt in PV1.CurrencySymbol hsh -- | Hash a 'PV1.Datum builtin data. datumHash :: PV1.Datum -> PV1.DatumHash @@ -115,7 +127,7 @@ dataHash :: Builtins.BuiltinData -> Builtins.BuiltinByteString dataHash = Builtins.toBuiltin . C.Api.serialiseToRawBytes - . C.Api.hashScriptData + . C.Api.hashScriptDataBytes . toCardanoAPIData -- | Convert a 'Builtins.BuiltinsData' value to a 'cardano-api' script @@ -123,8 +135,8 @@ dataHash = -- -- For why we depend on `cardano-api`, -- see note [Hash computation of datums, redeemers and scripts] -toCardanoAPIData :: Builtins.BuiltinData -> C.Api.ScriptData -toCardanoAPIData = C.Api.fromPlutusData . Builtins.builtinDataToData +toCardanoAPIData :: Builtins.BuiltinData -> C.Api.HashableScriptData +toCardanoAPIData = C.Api.unsafeHashableScriptData . C.Api.fromPlutusData . Builtins.builtinDataToData {- Note [Hash computation of datums, redeemers and scripts] @@ -151,3 +163,57 @@ also probably depend on `cardano-api`, so the dependency on `cardano-api` should If this becomes an issue, we'll change the implementation. -} +-- | 'Validator' is a wrapper around 'Script's which are used as validators in transaction outputs. +newtype Validator = Validator { getValidator :: Script } + deriving stock (Generic) + deriving newtype (Eq, Ord, Serialise) + deriving Pretty via (PrettyShow Validator) + +instance Show Validator where + show = const "Validator {