Merge remote-tracking branch 'origin/develop' into dshuiski/1119-query-backend

klntsky · klntsky · commit cfa8af96a4d2 · 2023-01-30T16:35:08.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Added
 
+- `bundlePursProject` allows passing of `includeBundledModule` flag to export the bundled JS module `spago bundle-module` outputs
+
 - `Contract.Transaction` exports `mkPoolPubKeyHash` and `poolPubKeyHashToBech32` for bech32 roundtripping ([#1360](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1360))
 
 ### Changed
@@ -55,12 +57,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 - Testing interface is re-implemented. Assertion functions from `Contract.Test.Utils` are moved to `Contract.Test.Assert`. See [the docs](./doc/test-utils.md) for info on the new interface. ([#1389](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1389))
 
+- `startPlutipCluster` error message now includes cluster startup failure details. ([#1407](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1407))
+
 ### Removed
 
 ### Fixed
 - CIP-25 strings are now being split into chunks whose sizes are less than or equal to 64 to adhere to the CIP-25 standard ([#1343](https://github.com/Plutonomicon/cardano-transaction-lib/issues/1343))
 - Critical upstream fix in [`purescript-bignumber`](https://github.com/mlabs-haskell/purescript-bignumber/pull/2)
 - `OutputDatum` aeson encoding now roundtrips ([#1388](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1388))
+- Fix incorrect redeemer indexing for Plutus stake validator scripts ([#1417](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1417))
 
 ### Runtime Dependencies
 
diff --git a/doc/ctl-as-dependency.md b/doc/ctl-as-dependency.md
@@ -82,6 +82,10 @@ Make sure to perform **all** of the following steps, otherwise you **will** enco
 - That is, avoid using the `~` or `^` prefixes (e.g use versions like `"1.6.51"` instead of `"^1.6.51"`)
 - If you're using a `package-lock.json` (which is _highly_ recommended), you can update the lockfile with `npm i --package-lock-only`
 
+4. **Update your webpack config**
+
+- Sometimes the WebPack configuration also comes with breaking changes. Common source of problems are changes to `resolve.fallback`, `plugins` and `experiments` fields of the WebPack config. Use `git diff old-revision new-revision webpack.config.js` in the root of a cloned CTL repo, or use `git blame`.
+
 ## Using CTL from JS
 
 ### Bundling
diff --git a/nix/default.nix b/nix/default.nix
@@ -93,7 +93,7 @@ let
       # available in the shell environment. This can help with ensuring that
       # any e2e tests that you write and run with `Contract.Test.E2E` are
       # reproducible
-    , withChromium ? false
+    , withChromium ? true
     }:
       assert pkgs.lib.assertOneOf "formatter" formatter [ "purs-tidy" "purty" ];
       with pkgs.lib;
@@ -382,6 +382,8 @@ let
       # Generated `node_modules` in the Nix store. Can be passed to have better
       # control over individual project components
     , nodeModules ? projectNodeModules
+      # If the spago bundle-module output should be included in the derivation
+    , includeBundledModule ? false
     , ...
     }: pkgs.runCommand "${name}"
       {
@@ -405,6 +407,7 @@ let
         spago bundle-module --no-install --no-build -m "${main}" \
           --to ${bundledModuleName}
         mkdir ./dist
+        ${pkgs.lib.optionalString includeBundledModule "cp ${bundledModuleName} ./dist"}
         webpack --mode=production -c ${webpackConfig} -o ./dist \
           --entry ./${entrypoint}
         mkdir $out
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "@emurgo/cardano-message-signing-nodejs": "1.0.1",
     "@emurgo/cardano-serialization-lib-browser": "11.2.1",
     "@emurgo/cardano-serialization-lib-nodejs": "11.2.1",
+    "@mlabs-haskell/csl-gc-wrapper": "^1.0.1",
     "@mlabs-haskell/json-bigint": " 1.0.0",
     "@noble/secp256k1": "^1.7.0",
     "apply-args-browser": "0.0.1",
diff --git a/src/Internal/ApplyArgs.js b/src/Internal/ApplyArgs.js
@@ -9,6 +9,8 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
   apply_args = require("apply-args-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
+apply_args = require("@mlabs-haskell/csl-gc-wrapper")(apply_args);
 
 /**
  * @param {} left
diff --git a/src/Internal/BalanceTx/UtxoMinAda.js b/src/Internal/BalanceTx/UtxoMinAda.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.minAdaForOutput = maybe => txOutput => dataCost => {
   try {
diff --git a/src/Internal/Deserialization/FromBytes.js b/src/Internal/Deserialization/FromBytes.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._fromBytes = helper => name => bytes => {
   try {
diff --git a/src/Internal/Deserialization/Keys.js b/src/Internal/Deserialization/Keys.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.freshPrivateKey = () => {
   return lib.PrivateKey.generate_ed25519();
diff --git a/src/Internal/Deserialization/Language.js b/src/Internal/Deserialization/Language.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._convertLanguage = langCtors => cslLang => {
   if (cslLang.kind() == lib.LanguageKind.PlutusV1) {
diff --git a/src/Internal/Deserialization/NativeScript.js b/src/Internal/Deserialization/NativeScript.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._convertNativeScript = handler => ns => {
   switch (ns.kind()) {
diff --git a/src/Internal/Deserialization/PlutusData.js b/src/Internal/Deserialization/PlutusData.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._convertPlutusData = handle => pd => {
   switch (pd.kind()) {
diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 const call = property => object => object[property]();
 const callMaybe = property => maybe => object => {
diff --git a/src/Internal/Deserialization/UnspentOutput.js b/src/Internal/Deserialization/UnspentOutput.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 const call = property => object => object[property]();
 const callMaybe = property => maybe => object => {
diff --git a/src/Internal/Hashing.js b/src/Internal/Hashing.js
@@ -10,6 +10,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.blake2b256Hash = bytesToHash => {
   return Blake2.blake2b(bytesToHash, null, 32);
diff --git a/src/Internal/Plutip/Server.purs b/src/Internal/Plutip/Server.purs
@@ -660,8 +660,9 @@ startPlutipCluster cfg keysToGenerate = do
         $ (decodeAeson <=< parseJsonStringToAeson) body
   either (liftEffect <<< throw <<< show) pure res >>=
     case _ of
-      ClusterStartupFailure _ -> do
-        liftEffect $ throw "Failed to start up cluster"
+      ClusterStartupFailure reason -> do
+        liftEffect $ throw $
+          "Failed to start up cluster. Reason: " <> show reason
       ClusterStartupSuccess response@{ privateKeys } ->
         case Array.uncons privateKeys of
           Nothing ->
diff --git a/src/Internal/Plutip/UtxoDistribution.purs b/src/Internal/Plutip/UtxoDistribution.purs
@@ -56,6 +56,7 @@ import Data.Map as Map
 import Data.Maybe (Maybe(Nothing, Just))
 import Data.Newtype (unwrap)
 import Data.Traversable (traverse)
+import Data.Tuple (Tuple)
 import Data.Tuple.Nested (type (/\), (/\))
 import Effect.Class (liftEffect)
 import Effect.Ref as Ref
@@ -135,7 +136,8 @@ instance
   ( UtxoDistribution headSpec headWallets
   , UtxoDistribution restSpec restWallets
   ) =>
-  UtxoDistribution (headSpec /\ restSpec) (headWallets /\ restWallets) where
+  UtxoDistribution (Tuple headSpec restSpec)
+    (Tuple headWallets restWallets) where
   encodeDistribution (distr /\ rest) =
     encodeDistribution distr <> encodeDistribution rest
   decodeWallets d p = decodeWalletsDefault d p
diff --git a/src/Internal/Serialization.js b/src/Internal/Serialization.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 const setter = prop => obj => value => () => obj["set_" + prop](value);
 
diff --git a/src/Internal/Serialization/Address.js b/src/Internal/Serialization/Address.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 const callClassStaticMaybe = (classname, functionname) => maybe => input => {
   let ret = null;
diff --git a/src/Internal/Serialization/AuxiliaryData.js b/src/Internal/Serialization/AuxiliaryData.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 const setter = prop => obj => value => () => obj["set_" + prop](value);
 
diff --git a/src/Internal/Serialization/BigInt.js b/src/Internal/Serialization/BigInt.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._BigInt_from_str = helper => str => {
   try {
diff --git a/src/Internal/Serialization/Hash.js b/src/Internal/Serialization/Hash.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.hashToBytes = hash => {
   return hash.to_bytes();
diff --git a/src/Internal/Serialization/MinFee.js b/src/Internal/Serialization/MinFee.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._minFee = maybe => tx => txFeeFixed => txFeePerByte => {
   try {
diff --git a/src/Internal/Serialization/NativeScript.js b/src/Internal/Serialization/NativeScript.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 const mkScript = prop => arg => lib.NativeScript[prop](arg);
 
diff --git a/src/Internal/Serialization/PlutusData.js b/src/Internal/Serialization/PlutusData.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports._mkPlutusData_bytes = bytes => lib.PlutusData.new_bytes(bytes);
 exports._mkPlutusData_list = list => lib.PlutusData.new_list(list);
diff --git a/src/Internal/Serialization/PlutusScript.js b/src/Internal/Serialization/PlutusScript.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.newPlutusV1Script = bytes => lib.PlutusScript.new(bytes);
 
diff --git a/src/Internal/Serialization/WitnessSet.js b/src/Internal/Serialization/WitnessSet.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.newTransactionWitnessSet = () => lib.TransactionWitnessSet.new();
 
diff --git a/src/Internal/Types/BigNum.js b/src/Internal/Types/BigNum.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.bnCompare = lhs => rhs => lhs.compare(rhs);
 
diff --git a/src/Internal/Types/Int.js b/src/Internal/Types/Int.js
@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
 } else {
   lib = require("@emurgo/cardano-serialization-lib-nodejs");
 }
+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);
 
 exports.newPositive = lib.Int.new;
 exports.newNegative = lib.Int.new_negative;
diff --git a/src/Internal/Types/ScriptLookups.purs b/src/Internal/Types/ScriptLookups.purs
diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json
diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json
diff --git a/test/Plutip/Contract.purs b/test/Plutip/Contract.purs
diff --git a/test/Plutip/Staking.purs b/test/Plutip/Staking.purs
diff --git a/test/Wallet/Cip30/SignData.js b/test/Wallet/Cip30/SignData.js

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {`
`9`	`9`	`lib = require("@emurgo/cardano-serialization-lib-nodejs");`
`10`	`10`	`apply_args = require("apply-args-nodejs");`
`11`	`11`	`}`
	`12`	`+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);`
	`13`	`+apply_args = require("@mlabs-haskell/csl-gc-wrapper")(apply_args);`
`12`	`14`
`13`	`15`	`/**`
`14`	`16`	`* @param {} left`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {`
`6`	`6`	`} else {`
`7`	`7`	`lib = require("@emurgo/cardano-serialization-lib-nodejs");`
`8`	`8`	`}`
	`9`	`+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);`
`9`	`10`
`10`	`11`	`exports.minAdaForOutput = maybe => txOutput => dataCost => {`
`11`	`12`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {`
`10`	`10`	`} else {`
`11`	`11`	`lib = require("@emurgo/cardano-serialization-lib-nodejs");`
`12`	`12`	`}`
	`13`	`+lib = require("@mlabs-haskell/csl-gc-wrapper")(lib);`
`13`	`14`
`14`	`15`	`exports.blake2b256Hash = bytesToHash => {`
`15`	`16`	`return Blake2.blake2b(bytesToHash, null, 32);`