@helios-lang/contract-utils 0.2.20 → 0.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/contract-utils",
-    "version": "0.2.20",
+    "version": "0.2.22",
     "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
     "main": "src/index.js",
     "types": "types/index.d.ts",

package/src/codegen/LoadedValidator.js

@@ -12,6 +12,7 @@ import { UserFunc } from "../cast/UserFunc.js"
  */
 
 /**
+ * * Note: `$hashDependencies` doesn't contain the indirect dependencies! It must be kept to a minimum in order to inform in which order the validators must be compiled
  * @typedef {{
  *   $name: string
  *   $sourceCode: string

package/src/context/DagCompiler.js

@@ -94,7 +94,10 @@ export class DagCompiler {
             validator.$hashDependencies.forEach((v) => buildValidator(v))
 
             // get the dependencies
-            const hashDeps = this.getHashDependencies(validator)
+            const hashDepHashes = this.getHashDepHashes(
+                validator,
+                Object.keys(hashTypes)
+            )
             const moduleDeps = getModuleDependencies(validator)
 
             const excludeUserFuncs = new Set(Object.keys(this.cachedUserFuncs))
@@ -105,7 +108,7 @@ export class DagCompiler {
                 moduleDeps,
                 {
                     optimize: true,
-                    hashDependencies: hashDeps,
+                    hashDependencies: hashDepHashes,
                     allValidatorHashTypes: hashTypes,
                     dependsOnOwnHash: validator.$dependsOnOwnHash,
                     parameters: parameters,
@@ -140,7 +143,7 @@ export class DagCompiler {
                 Array.from(moduleDeps.values()),
                 {
                     optimize: false,
-                    hashDependencies: hashDeps,
+                    hashDependencies: hashDepHashes,
                     allValidatorHashTypes: hashTypes,
                     ownHash: validator.$dependsOnOwnHash ? ownHash : undefined,
                     parameters: parameters,
@@ -236,13 +239,14 @@ export class DagCompiler {
     /**
      * @private
      * @param {LoadedValidator} validator
+     * @param {string[]} allValidators - add a dummy `#` for all validators that aren't hash dependencies (the optimizer will remove them, but the IR name resolution will fail if we don't have them)
      * @returns {{[name: string]: string}} - TODO: do we really need the purpose?
      */
-    getHashDependencies(validator) {
+    getHashDepHashes(validator, allValidators) {
         /**
          * @type {{[name: string]: string}}
          */
-        const deps = {}
+        const hashes = {}
 
         validator.$hashDependencies.forEach((dep) => {
             const k = dep.$name
@@ -254,10 +258,16 @@ export class DagCompiler {
                 )
             }
 
-            deps[k] = v.toHex()
+            hashes[k] = v.toHex()
+        })
+
+        allValidators.forEach((v) => {
+            if (!(v in hashes)) {
+                hashes[v] = "#"
+            }
         })
 
-        return deps
+        return hashes
     }
 
     /**
@@ -272,13 +282,18 @@ export class DagCompiler {
          */
         const res = {}
 
-        validators.forEach((v) => {
-            res[v.$name] = this.lib.getScriptHashType(v.$purpose)
+        /**
+         * @param {ReadonlyArray<LoadedValidator>} vs
+         */
+        const addHashes = (vs) => {
+            vs.forEach((v) => {
+                res[v.$name] = this.lib.getScriptHashType(v.$purpose)
 
-            v.$hashDependencies.forEach((d) => {
-                res[d.$name] = this.lib.getScriptHashType(d.$purpose)
+                addHashes(v.$hashDependencies)
             })
-        })
+        }
+
+        addHashes(validators)
 
         return res
     }

package/types/codegen/LoadedValidator.d.ts

@@ -1,6 +1,9 @@
 export type CastLike<TStrict, TPermissive> = import("../cast/Cast.js").CastLike<TStrict, TPermissive>;
 export type UplcProgram = import("@helios-lang/uplc").UplcProgram;
 export type LoadedModule = import("./LoadedModule.js").LoadedModule;
+/**
+ * * Note: `$hashDependencies` doesn't contain the indirect dependencies! It must be kept to a minimum in order to inform in which order the validators must be compiled
+ */
 export type LoadedValidator = {
     $name: string;
     $sourceCode: string;

package/types/codegen/LoadedValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoadedValidator.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedValidator.js"],"names":[],"mappings":"6CAKa,OAAO,iBAAiB,EAAE,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;0BAIxD,OAAO,mBAAmB,EAAE,WAAW;2BACvC,OAAO,mBAAmB,EAAE,YAAY;;WAKzC,MAAM;iBACA,MAAM;mBACJ,cAAc,YAAY,CAAC;uBACvB,cAAc,eAAe,CAAC;uBAC9B,OAAO;;;;;+BAEU,WAAW,KAAK,SAAS,GAAG,CAAC;;eACtD,SAAS,GAAG,EAAE,GAAG,CAAC;;cAGjB,UAAU,GAAG,OAAO;YACtB,SAAS,GAAG,EAAE,GAAG,CAAC;;cAEhB,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,SAAS;;;WAM7C,MAAM;;;;;WAOQ,MAAM;;;;6DAM7B,0BAA0B,CAAC,CAAC,eAAe,CAAC,CAAC;yBA/CjC,qBAAqB"}
+{"version":3,"file":"LoadedValidator.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedValidator.js"],"names":[],"mappings":"6CAKa,OAAO,iBAAiB,EAAE,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;0BAIxD,OAAO,mBAAmB,EAAE,WAAW;2BACvC,OAAO,mBAAmB,EAAE,YAAY;;;;;WAMzC,MAAM;iBACA,MAAM;mBACJ,cAAc,YAAY,CAAC;uBACvB,cAAc,eAAe,CAAC;uBAC9B,OAAO;;;;;+BAEU,WAAW,KAAK,SAAS,GAAG,CAAC;;eACtD,SAAS,GAAG,EAAE,GAAG,CAAC;;cAGjB,UAAU,GAAG,OAAO;YACtB,SAAS,GAAG,EAAE,GAAG,CAAC;;cAEhB,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,SAAS;;;WAM7C,MAAM;;;;;WAOQ,MAAM;;;;6DAM7B,0BAA0B,CAAC,CAAC,eAAe,CAAC,CAAC;yBAhDjC,qBAAqB"}

package/types/context/DagCompiler.d.ts

@@ -70,9 +70,10 @@ export class DagCompiler {
     /**
      * @private
      * @param {LoadedValidator} validator
+     * @param {string[]} allValidators - add a dummy `#` for all validators that aren't hash dependencies (the optimizer will remove them, but the IR name resolution will fail if we don't have them)
      * @returns {{[name: string]: string}} - TODO: do we really need the purpose?
      */
-    private getHashDependencies;
+    private getHashDepHashes;
     /**
      * Also returns the hash types of any hash-dependencies
      * @private

package/types/context/DagCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AA8RA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AA5SD;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;GAEG;AACH;IA6BI;;;OAGG;IACH,iBAHW,WAAW,cACX,UAAU,EAOpB;IArCD;;;;OAIG;IACH,qBAAG;IAEH;;;;OAIG;IACH,wBAAM;IAEN;;;;OAIG;IACH,kCAAgB;IAEhB;;;;OAIG;IACH,iCAAe;IAQX,iDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CA2H7B;IAED;;;;;OAKG;IACH,4BA6BC;IAED;;;;OAIG;IACH,4BAoBC;IAED;;;;;OAKG;IACH,qBAeC;CACJ;0BAjRY,OAAO,mBAAmB,EAAE,WAAW;yBACvC,OAAO,kBAAkB,EAAE,UAAU;8BACrC,OAAO,+BAA+B,EAAE,eAAe;0BACvD,OAAO,sBAAsB,EAAE,WAAW;0CAC1C,OAAO,sBAAsB,EAAE,2BAA2B"}
+{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AA6SA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AA3TD;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;GAEG;AACH;IA6BI;;;OAGG;IACH,iBAHW,WAAW,cACX,UAAU,EAOpB;IArCD;;;;OAIG;IACH,qBAAG;IAEH;;;;OAIG;IACH,wBAAM;IAEN;;;;OAIG;IACH,kCAAgB;IAEhB;;;;OAIG;IACH,iCAAe;IAQX,iDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CA8H7B;IAED;;;;;OAKG;IACH,4BA6BC;IAED;;;;;OAKG;IACH,yBA0BC;IAED;;;;;OAKG;IACH,qBAoBC;CACJ;0BAhSY,OAAO,mBAAmB,EAAE,WAAW;yBACvC,OAAO,kBAAkB,EAAE,UAAU;8BACrC,OAAO,+BAA+B,EAAE,eAAe;0BACvD,OAAO,sBAAsB,EAAE,WAAW;0CAC1C,OAAO,sBAAsB,EAAE,2BAA2B"}