diff --git a/.gitignore b/.gitignore index 24cf75c..fdd099f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ /.psa* /.spago /.spago2nix/ -result \ No newline at end of file +result +/node_modules diff --git a/flake.nix b/flake.nix index cd1855b..71e0bb9 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,12 @@ }; }; - outputs = inputs @ { self, flake-parts, hercules-ci-effects, ... }: + outputs = + inputs @ { self + , flake-parts + , hercules-ci-effects + , ... + }: flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: { imports = [ # Hercules CI effects module used to deploy to GitHub Pages @@ -30,9 +35,14 @@ # Systems supported by this flake systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - perSystem = { self', pkgs, system, ... }: + perSystem = + { self' + , pkgs + , system + , ... + }: let - easy-ps = (import inputs.easy-purescript-nix { inherit pkgs; }); + easy-ps = import inputs.easy-purescript-nix { inherit pkgs; }; spagoPkgs = import ./spago-packages.nix { inherit pkgs; }; @@ -48,9 +58,9 @@ # If warnings generated from project source files will trigger a build error. # Controls `--strict` purescript-psa flag strictComp ? true - # Warnings from `purs` to silence during compilation, independent of `strictComp` + , # Warnings from `purs` to silence during compilation, independent of `strictComp` # Controls `--censor-codes` purescript-psa flag - , censorCodes ? [ "UserDefinedWarning" ] + censorCodes ? [ "UserDefinedWarning" ] , ... }: pkgs.stdenv.mkDerivation { @@ -68,7 +78,7 @@ unpackPhase = "true"; buildPhase = '' install-spago-style - psa ${pkgs.lib.optionalString strictComp "--strict" } \ + psa ${pkgs.lib.optionalString strictComp "--strict"} \ --censor-lib \ --is-lib=.spago ".spago/*/*/src/**/*.purs" \ --censor-codes=${builtins.concatStringsSep "," censorCodes} \ @@ -124,9 +134,9 @@ # If warnings generated from project source files will trigger a build error. # Controls `--strict` purescript-psa flag strictComp ? true - # Warnings from `purs` to silence during compilation, independent of `strictComp` + , # Warnings from `purs` to silence during compilation, independent of `strictComp` # Controls `--censor-codes` purescript-psa flag - , censorCodes ? [ "UserDefinedWarning" ] + censorCodes ? [ "UserDefinedWarning" ] , pursDependencies ? buildPursDependencies { inherit strictComp censorCodes; } @@ -165,7 +175,7 @@ chmod -R +w output/ ''; buildPhase = '' - psa ${pkgs.lib.optionalString strictComp "--strict" } \ + psa ${pkgs.lib.optionalString strictComp "--strict"} \ --censor-lib \ --is-lib=.spago ".spago/*/*/src/**/*.purs" \ --censor-codes=${builtins.concatStringsSep "," censorCodes} "./src/**/*.purs" \ @@ -186,21 +196,23 @@ { # The main Purescript module testMain - # The entry point function in the main PureScript module - , psEntryPoint ? "main" - # Additional variables to pass to the test environment - , env ? { } - # Passed through to the `buildInputs` of the derivation. Use this to add + , # The entry point function in the main PureScript module + psEntryPoint ? "main" + , # Additional variables to pass to the test environment + env ? { } + , # Passed through to the `buildInputs` of the derivation. Use this to add # additional packages to the test environment - , buildInputs ? [ ] + buildInputs ? [ ] , builtProject ? buildPursProject { main = testMain; } , ... - }: pkgs.runCommand "ps-test" + }: + pkgs.runCommand "ps-test" ( { src = ./.; buildInputs = [ pkgs.nodejs ]; - } // env + } + // env ) '' # Copy the purescript project files @@ -220,7 +232,6 @@ # Create output file to tell Nix we succeeded touch $out ''; - in { devShells = { @@ -258,26 +269,30 @@ # Example flake checks. Run with `nix flake check --keep-going` checks = { - tests = runPursTest { testMain = "Test.Main"; psEntryPoint = "main"; }; + tests = runPursTest { + testMain = "Test.Main"; + psEntryPoint = "main"; + }; - formatting-check = pkgs.runCommand "formatting-check" - { - nativeBuildInputs = with pkgs; [ - easy-ps.purs-tidy - nixpkgs-fmt - nodePackages.prettier - nodePackages.eslint - fd - ]; - } - '' - cd ${self} - purs-tidy check './src/**/*.purs' './test/**/*.purs' - nixpkgs-fmt --check "$(fd --no-ignore-parent -enix --exclude='spago*')" - prettier --log-level warn -c $(fd --no-ignore-parent -ejs -ecjs) - eslint --quiet $(fd --no-ignore-parent -ejs -ecjs) --parser-options 'sourceType: module' --parser-options 'ecmaVersion: 2016' - touch $out - ''; + formatting-check = + pkgs.runCommand "formatting-check" + { + nativeBuildInputs = with pkgs; [ + easy-ps.purs-tidy + nixpkgs-fmt + nodePackages.prettier + nodePackages.eslint + fd + ]; + } + '' + cd ${self} + purs-tidy check './src/**/*.purs' './test/**/*.purs' + nixpkgs-fmt --check "$(fd --no-ignore-parent -enix --exclude='spago*')" + prettier --log-level warn -c $(fd --no-ignore-parent -ejs -ecjs) + eslint --quiet $(fd --no-ignore-parent -ejs -ecjs) --parser-options 'sourceType: module' --parser-options 'ecmaVersion: 2016' + touch $out + ''; }; }; diff --git a/package-lock.json b/package-lock.json index df27edd..c92f779 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,35 +6,58 @@ "": { "name": "purescript-uplc-apply-args", "dependencies": { - "@mlabs-haskell/cardano-serialization-lib-gc": "^1.0.10", + "@mlabs-haskell/cardano-data-lite": "0.1.0-prerelease8", "@mlabs-haskell/json-bigint": "^2.0.0", "@mlabs-haskell/uplc-apply-args": "^2.0.1" } }, - "node_modules/@emurgo/cardano-serialization-lib-browser": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.5.0.tgz", - "integrity": "sha512-qchOJ9NYDUz10tzs5r5QhP9hK0p+ZOlRiBwPdTAxqAYLw/8emYBkQQLaS8T1DF6EkeudyrgS00ym5Trw1fo4iA==" + "node_modules/@aws-crypto/crc32": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", + "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", + "dependencies": { + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } }, - "node_modules/@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.5.0.tgz", - "integrity": "sha512-IlVABlRgo9XaTR1NunwZpWcxnfEv04ba2l1vkUz4S1W7Jt36F4CtffP+jPeqBZGnAe+fnUwo0XjIJC3ZTNToNQ==" + "node_modules/@aws-crypto/util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", + "dependencies": { + "@aws-sdk/types": "^3.222.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } }, - "node_modules/@mlabs-haskell/cardano-serialization-lib-gc": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-1.0.10.tgz", - "integrity": "sha512-7XFxxMvZH6oogWVP/teveVRUTRboWfY5fT0bkRDu68u9yb2HBjoMxkCkmF7MvJBVs2i0unt4UnzcrNm0dmHriQ==", + "node_modules/@aws-sdk/types": { + "version": "3.731.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.731.0.tgz", + "integrity": "sha512-NrdkJg6oOUbXR2r9WvHP408CLyvST8cJfp1/jP9pemtjvjPoh6NukbCtiSFdOOb1eryP02CnqQWItfJC1p2Y/Q==", "dependencies": { - "@emurgo/cardano-serialization-lib-browser": "^11.2.1", - "@emurgo/cardano-serialization-lib-nodejs": "^11.2.1", - "@mlabs-haskell/csl-gc-wrapper": "^1.0.2" + "@smithy/types": "^4.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, - "node_modules/@mlabs-haskell/csl-gc-wrapper": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.2.tgz", - "integrity": "sha512-jyASltvC/ZVzpMUgbIkIaCLc56uGqymCPnieLkgIMWPhzcRoAxEfshjYONyxPY5XIl0NdIQXjbppXFoPQMk0VQ==" + "node_modules/@mlabs-haskell/cardano-data-lite": { + "version": "0.1.0-prerelease8", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-data-lite/-/cardano-data-lite-0.1.0-prerelease8.tgz", + "integrity": "sha512-qqTYizIkqDjlPyqZKG5xQDVuA+A2vQOuhlcPQX9qULvnYlTOD3NSeMocsUEo+Tzfj/P5H0DYWakx4GMRlZ1xbA==", + "dependencies": { + "@aws-crypto/crc32": "^5.2.0", + "@noble/ed25519": "^2.1.0", + "@noble/hashes": "^1.5.0", + "base58-js": "^2.0.0", + "bech32": "^2.0.0", + "tweetnacl": "^1.0.3" + } }, "node_modules/@mlabs-haskell/json-bigint": { "version": "2.0.0", @@ -59,33 +82,138 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/@mlabs-haskell/uplc-apply-args-nodejs/-/uplc-apply-args-nodejs-0.0.3.tgz", "integrity": "sha512-0uLz+67U1yiXvt3qu/7NBd0WK6LWXf9XteaInQk56RqRbxi4WKA/1Rm73VuciZzLWohXMDNbVNCiirmXi6k+9A==" + }, + "node_modules/@noble/ed25519": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-2.2.3.tgz", + "integrity": "sha512-iHV8eI2mRcUmOx159QNrU8vTpQ/Xm70yJ2cTk3Trc86++02usfqFoNl6x0p3JN81ZDS/1gx6xiK0OwrgqCT43g==", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@noble/hashes": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.1.tgz", + "integrity": "sha512-B8XBPsn4vT/KJAGqDzbwztd+6Yte3P4V7iafm24bxgDe/mlRuK6xmWPuCNrKt2vDafZ8MfJLlchDG/vYafQEjQ==", + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/types": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.1.0.tgz", + "integrity": "sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/base58-js": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-2.0.0.tgz", + "integrity": "sha512-nAV5d32QXuGcGptSApkKpC1gGakWBnfJMNjKrYTBh4tb0szfZF+ooueFLy8T4VrY+o4SrE/TyrtUnRZcwZchaA==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/bech32": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz", + "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==" + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + }, + "node_modules/tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" } }, "dependencies": { - "@emurgo/cardano-serialization-lib-browser": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.5.0.tgz", - "integrity": "sha512-qchOJ9NYDUz10tzs5r5QhP9hK0p+ZOlRiBwPdTAxqAYLw/8emYBkQQLaS8T1DF6EkeudyrgS00ym5Trw1fo4iA==" - }, - "@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.5.0.tgz", - "integrity": "sha512-IlVABlRgo9XaTR1NunwZpWcxnfEv04ba2l1vkUz4S1W7Jt36F4CtffP+jPeqBZGnAe+fnUwo0XjIJC3ZTNToNQ==" - }, - "@mlabs-haskell/cardano-serialization-lib-gc": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc/-/cardano-serialization-lib-gc-1.0.10.tgz", - "integrity": "sha512-7XFxxMvZH6oogWVP/teveVRUTRboWfY5fT0bkRDu68u9yb2HBjoMxkCkmF7MvJBVs2i0unt4UnzcrNm0dmHriQ==", + "@aws-crypto/crc32": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", + "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", "requires": { - "@emurgo/cardano-serialization-lib-browser": "^11.2.1", - "@emurgo/cardano-serialization-lib-nodejs": "^11.2.1", - "@mlabs-haskell/csl-gc-wrapper": "^1.0.2" + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" } }, - "@mlabs-haskell/csl-gc-wrapper": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.2.tgz", - "integrity": "sha512-jyASltvC/ZVzpMUgbIkIaCLc56uGqymCPnieLkgIMWPhzcRoAxEfshjYONyxPY5XIl0NdIQXjbppXFoPQMk0VQ==" + "@aws-crypto/util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", + "requires": { + "@aws-sdk/types": "^3.222.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "@aws-sdk/types": { + "version": "3.731.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.731.0.tgz", + "integrity": "sha512-NrdkJg6oOUbXR2r9WvHP408CLyvST8cJfp1/jP9pemtjvjPoh6NukbCtiSFdOOb1eryP02CnqQWItfJC1p2Y/Q==", + "requires": { + "@smithy/types": "^4.0.0", + "tslib": "^2.6.2" + } + }, + "@mlabs-haskell/cardano-data-lite": { + "version": "0.1.0-prerelease8", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-data-lite/-/cardano-data-lite-0.1.0-prerelease8.tgz", + "integrity": "sha512-qqTYizIkqDjlPyqZKG5xQDVuA+A2vQOuhlcPQX9qULvnYlTOD3NSeMocsUEo+Tzfj/P5H0DYWakx4GMRlZ1xbA==", + "requires": { + "@aws-crypto/crc32": "^5.2.0", + "@noble/ed25519": "^2.1.0", + "@noble/hashes": "^1.5.0", + "base58-js": "^2.0.0", + "bech32": "^2.0.0", + "tweetnacl": "^1.0.3" + } }, "@mlabs-haskell/json-bigint": { "version": "2.0.0", @@ -110,6 +238,70 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/@mlabs-haskell/uplc-apply-args-nodejs/-/uplc-apply-args-nodejs-0.0.3.tgz", "integrity": "sha512-0uLz+67U1yiXvt3qu/7NBd0WK6LWXf9XteaInQk56RqRbxi4WKA/1Rm73VuciZzLWohXMDNbVNCiirmXi6k+9A==" + }, + "@noble/ed25519": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-2.2.3.tgz", + "integrity": "sha512-iHV8eI2mRcUmOx159QNrU8vTpQ/Xm70yJ2cTk3Trc86++02usfqFoNl6x0p3JN81ZDS/1gx6xiK0OwrgqCT43g==" + }, + "@noble/hashes": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.1.tgz", + "integrity": "sha512-B8XBPsn4vT/KJAGqDzbwztd+6Yte3P4V7iafm24bxgDe/mlRuK6xmWPuCNrKt2vDafZ8MfJLlchDG/vYafQEjQ==" + }, + "@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "requires": { + "tslib": "^2.6.2" + } + }, + "@smithy/types": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.1.0.tgz", + "integrity": "sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==", + "requires": { + "tslib": "^2.6.2" + } + }, + "@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "requires": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + } + }, + "@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "requires": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + } + }, + "base58-js": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-2.0.0.tgz", + "integrity": "sha512-nAV5d32QXuGcGptSApkKpC1gGakWBnfJMNjKrYTBh4tb0szfZF+ooueFLy8T4VrY+o4SrE/TyrtUnRZcwZchaA==" + }, + "bech32": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz", + "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==" + }, + "tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + }, + "tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" } } } diff --git a/package.json b/package.json index 783c636..e932324 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@mlabs-haskell/json-bigint": "^2.0.0", - "@mlabs-haskell/cardano-serialization-lib-gc": "^1.0.10", + "@mlabs-haskell/cardano-data-lite": "0.1.0-prerelease8", "@mlabs-haskell/uplc-apply-args": "^2.0.1" }, "prettier": { diff --git a/packages.dhall b/packages.dhall index a4af254..441221a 100644 --- a/packages.dhall +++ b/packages.dhall @@ -1,103 +1,3 @@ -{- -Welcome to your new Dhall package-set! - -Below are instructions for how to edit this file for most use -cases, so that you don't need to know Dhall to use it. - -## Use Cases - -Most will want to do one or both of these options: -1. Override/Patch a package's dependency -2. Add a package not already in the default package set - -This file will continue to work whether you use one or both options. -Instructions for each option are explained below. - -### Overriding/Patching a package - -Purpose: -- Change a package's dependency to a newer/older release than the - default package set's release -- Use your own modified version of some dependency that may - include new API, changed API, removed API by - using your custom git repo of the library rather than - the package set's repo - -Syntax: -where `entityName` is one of the following: -- dependencies -- repo -- version -------------------------------- -let upstream = -- -in upstream - with packageName.entityName = "new value" -------------------------------- - -Example: -------------------------------- -let upstream = -- -in upstream - with halogen.version = "master" - with halogen.repo = "https://example.com/path/to/git/repo.git" - - with halogen-vdom.version = "v4.0.0" - with halogen-vdom.dependencies = [ "extra-dependency" ] # halogen-vdom.dependencies -------------------------------- - -### Additions - -Purpose: -- Add packages that aren't already included in the default package set - -Syntax: -where `` is: -- a tag (i.e. "v4.0.0") -- a branch (i.e. "master") -- commit hash (i.e. "701f3e44aafb1a6459281714858fadf2c4c2a977") -------------------------------- -let upstream = -- -in upstream - with new-package-name = - { dependencies = - [ "dependency1" - , "dependency2" - ] - , repo = - "https://example.com/path/to/git/repo.git" - , version = - "" - } -------------------------------- - -Example: -------------------------------- -let upstream = -- -in upstream - with benchotron = - { dependencies = - [ "arrays" - , "exists" - , "profunctor" - , "strings" - , "quickcheck" - , "lcg" - , "transformers" - , "foldable-traversable" - , "exceptions" - , "node-fs" - , "node-buffer" - , "node-readline" - , "datetime" - , "now" - ] - , repo = - "https://github.com/hdgarrood/purescript-benchotron.git" - , version = - "v7.0.0" - } -------------------------------- --} let upstream = https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20230105/packages.dhall sha256:3e9fbc9ba03e9a1fcfd895f65e2d50ee2f5e86c4cd273f3d5c841b655a0e1bda @@ -172,14 +72,15 @@ let additions = , cardano-types = { dependencies = [ "aeson" + , "aff" , "arraybuffer-types" , "arrays" , "bifunctors" , "bytearrays" , "cardano-plutus-data-schema" - , "cardano-serialization-lib" - , "console" + , "cardano-data-lite" , "control" + , "datetime" , "effect" , "either" , "encoding" @@ -193,6 +94,8 @@ let additions = , "literals" , "maybe" , "monad-logger" + , "mote" + , "mote-testplan" , "newtype" , "nonempty" , "nullable" @@ -200,11 +103,12 @@ let additions = , "partial" , "prelude" , "profunctor" + , "profunctor-lenses" , "quickcheck" , "rationals" , "record" , "safe-coerce" - , "strings" + , "spec" , "these" , "tuples" , "typelevel-prelude" @@ -213,9 +117,9 @@ let additions = , "unsafe-coerce" ] , repo = "https://github.com/mlabs-haskell/purescript-cardano-types" - , version = "v1.0.1" + , version = "v5.0.0" } - , cardano-serialization-lib = + , cardano-data-lite = { dependencies = [ "aeson" , "argonaut" @@ -230,9 +134,8 @@ let additions = , "profunctor" , "tuples" ] - , repo = - "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib" - , version = "c66afbb9c572db096690ec1dd786c9ec96105c0d" + , repo = "https://github.com/mlabs-haskell/purescript-cardano-data-lite" + , version = "070a1a502472211853099c2566a7e9100a7b1a61" } , cardano-plutus-data-schema = { dependencies = [ "prelude" ] diff --git a/spago-packages.nix b/spago-packages.nix index 8724f6f..32180fd 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -161,25 +161,25 @@ let installPhase = "ln -s $src $out"; }; - "cardano-plutus-data-schema" = pkgs.stdenv.mkDerivation { - name = "cardano-plutus-data-schema"; - version = "eb0bb78927c50c4bee364e932c9fa8cf94546191"; + "cardano-data-lite" = pkgs.stdenv.mkDerivation { + name = "cardano-data-lite"; + version = "070a1a502472211853099c2566a7e9100a7b1a61"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-cardano-plutus-data-schema"; - rev = "eb0bb78927c50c4bee364e932c9fa8cf94546191"; - sha256 = "118i6dlfqk7q0va3bd4vplsv9i6sh83cr51gshas6jjwc5qbriks"; + url = "https://github.com/mlabs-haskell/purescript-cardano-data-lite"; + rev = "070a1a502472211853099c2566a7e9100a7b1a61"; + sha256 = "117ryx4w2lzkw4v8rsz7lp4nld6dd08nw2s8mcjcrw1dwrp2j4gk"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; }; - "cardano-serialization-lib" = pkgs.stdenv.mkDerivation { - name = "cardano-serialization-lib"; - version = "c66afbb9c572db096690ec1dd786c9ec96105c0d"; + "cardano-plutus-data-schema" = pkgs.stdenv.mkDerivation { + name = "cardano-plutus-data-schema"; + version = "eb0bb78927c50c4bee364e932c9fa8cf94546191"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-cardano-serialization-lib"; - rev = "c66afbb9c572db096690ec1dd786c9ec96105c0d"; - sha256 = "1pi5q45nx1varl2pjpd60vfxv2cjvlg1ms7xnsfwb2acl216lmr5"; + url = "https://github.com/mlabs-haskell/purescript-cardano-plutus-data-schema"; + rev = "eb0bb78927c50c4bee364e932c9fa8cf94546191"; + sha256 = "118i6dlfqk7q0va3bd4vplsv9i6sh83cr51gshas6jjwc5qbriks"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -187,11 +187,11 @@ let "cardano-types" = pkgs.stdenv.mkDerivation { name = "cardano-types"; - version = "v1.0.1"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-types"; - rev = "715d4b2dcf8b29cb45001209ee562f758a513261"; - sha256 = "1xcrdmpwd3qcdiyjfrj0z2dh56l4z1s97r25b6nhlqwmwz7qz19z"; + rev = "348fbbefa8bec5050e8492f5a9201ac5bb17c9d9"; + sha256 = "06977niflqdpk4kw6d3480ak0m2rwi9fngjblxnqddqpdyj6zq1d"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/spago.dhall b/spago.dhall index 784b73d..f624ff1 100644 --- a/spago.dhall +++ b/spago.dhall @@ -1,20 +1,8 @@ -{- -Welcome to a Spago project! -You can edit this file as you like. - -Need help? See the following resources: -- Spago documentation: https://github.com/purescript/spago -- Dhall language tour: https://docs.dhall-lang.org/tutorials/Language-Tour.html - -When creating a new Spago project, you can use -`spago init --no-comments` or `spago init -C` -to generate this file without the comments in this block. --} -{ name = "purescript-uplc-apply-args" +{ name = "uplc-apply-args" , dependencies = [ "aff" , "bytearrays" - , "cardano-serialization-lib" + , "cardano-data-lite" , "cardano-types" , "effect" , "either" diff --git a/src/Cardano/Plutus/ApplyArgs.js b/src/Cardano/Plutus/ApplyArgs.js index 5866d7b..6309d58 100644 --- a/src/Cardano/Plutus/ApplyArgs.js +++ b/src/Cardano/Plutus/ApplyArgs.js @@ -1,4 +1,4 @@ -import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc"; +import * as lib from "@mlabs-haskell/cardano-data-lite"; import * as apply_args from "@mlabs-haskell/uplc-apply-args"; /** @@ -10,7 +10,6 @@ import * as apply_args from "@mlabs-haskell/uplc-apply-args"; */ export function apply_params_to_script(left) { return right => args => script => { - let version = script.language_version(); let appliedScript; try { let scriptBytes = script.bytes(); // raw bytes @@ -27,6 +26,6 @@ export function apply_params_to_script(left) { } catch (e1) { return left("Error serializing arguments: ".concat(e1.toString())); } - return right(lib.PlutusScript.new_with_version(appliedScript, version)); + return right(lib.PlutusScript.new(appliedScript)); }; } diff --git a/src/Cardano/Plutus/ApplyArgs.purs b/src/Cardano/Plutus/ApplyArgs.purs index 26de5c9..6bc6b35 100644 --- a/src/Cardano/Plutus/ApplyArgs.purs +++ b/src/Cardano/Plutus/ApplyArgs.purs @@ -4,28 +4,31 @@ module Cardano.Plutus.ApplyArgs import Prelude -import Cardano.Serialization.Lib as CSL +import Cardano.Data.Lite as CDL +import Cardano.Types (PlutusScript(PlutusScript)) import Cardano.Types.PlutusData (PlutusData(List)) import Cardano.Types.PlutusData as PlutusData import Cardano.Types.PlutusScript (PlutusScript) import Cardano.Types.PlutusScript as PlutusScript import Data.Either (Either(Left, Right)) +import Data.Tuple.Nested ((/\)) foreign import apply_params_to_script :: (forall a b. a -> Either a b) -> (forall a b. b -> Either a b) - -> CSL.PlutusData - -> CSL.PlutusScript - -> Either String CSL.PlutusScript + -> CDL.PlutusData + -> CDL.PlutusScript + -> Either String CDL.PlutusScript apply_params_to_script_either - :: CSL.PlutusData -> CSL.PlutusScript -> Either String CSL.PlutusScript -apply_params_to_script_either = apply_params_to_script Left Right + :: CDL.PlutusData + -> CDL.PlutusScript + -> Either String CDL.PlutusScript +apply_params_to_script_either = + apply_params_to_script Left Right -applyArgs - :: PlutusScript -> Array PlutusData -> Either String PlutusScript -applyArgs script paramsList = do - let params = PlutusData.toCsl (List paramsList) - appliedScript <- apply_params_to_script_either params - (PlutusScript.toCsl script) - Right $ PlutusScript.fromCsl appliedScript +applyArgs :: PlutusScript -> Array PlutusData -> Either String PlutusScript +applyArgs script@(PlutusScript (_ /\ lang)) paramsList = do + let params = PlutusData.toCdl (List paramsList) + appliedScript <- apply_params_to_script_either params $ PlutusScript.toCdl script + Right $ PlutusScript.fromCdl appliedScript lang diff --git a/test/Main.purs b/test/Main.purs index 26f74ad..0ac4dcd 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -4,16 +4,16 @@ import Prelude import Cardano.Plutus.ApplyArgs (applyArgs) import Cardano.ToData (toData) -import Cardano.Types (PlutusData(..), PlutusScript(..)) +import Cardano.Types (PlutusData(Bytes, Constr, List, Map), PlutusScript(PlutusScript)) import Cardano.Types.BigNum as BigNum import Cardano.Types.Language (Language(PlutusV1, PlutusV2)) import Control.Monad.Error.Class (class MonadError, liftEither) import Data.ByteArray (ByteArray, hexToByteArray, hexToByteArrayUnsafe) import Data.Foldable (foldl, traverse_) import Data.List.Lazy (replicate) -import Data.Maybe (Maybe(..), maybe) +import Data.Maybe (Maybe(Just, Nothing), maybe) import Data.Profunctor.Choice (left) -import Data.Tuple (Tuple(..), uncurry) +import Data.Tuple (Tuple(Tuple), uncurry) import Data.Tuple.Nested ((/\)) import Effect (Effect) import Effect.Aff (Aff, Error, error, launchAff_, throwError)