@helios-lang/contract-utils 0.2.40 → 0.2.41

package/package.json

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

package/src/compiler/CompilerLib.js

@@ -25,7 +25,7 @@ export {}
  *   isTestnet: boolean
  *   optimize: boolean
  *   excludeUserFuncs?: Set<string>
- *   onCompileUserFunc?: (name: string, cborHex: string, plutusVersion: PlutusVersion) => void
+ *   onCompileUserFunc?: (name: string, cborHex: string, altCborHex: Option<string>, plutusVersion: PlutusVersion) => void
  * }} CompileOptions
  */
 

package/src/compiler/CompilerLib_v0_17.js

@@ -1,8 +1,10 @@
 import { bytesToHex } from "@helios-lang/codec-utils"
+import { None } from "@helios-lang/type-utils"
 import { UplcProgramV2 } from "@helios-lang/uplc"
 
 /**
  * @typedef {import("@helios-lang/uplc").UplcData} UplcData
+ * @typedef {import("@helios-lang/uplc").UplcProgramV2I} UplcProgramV2I
  * @typedef {import("./CompilerLib.js").CompilerLib} CompilerLib
  * @typedef {import("./CompilerLib.js").CompileOptions} CompileOptions
  * @typedef {import("./CompilerLib.js").CompileOutput} CompileOutput
@@ -21,7 +23,7 @@ import { UplcProgramV2 } from "@helios-lang/uplc"
  *     hashDependencies?: Record<string, string>
  *     validatorIndices?: Record<string, number>
  *     excludeUserFuncs?: Set<string>
- *     onCompileUserFunc?: (name: string, uplc: UplcProgramV2) => void
+ *     onCompileUserFunc?: (name: string, uplc: UplcProgramV2I) => void
  *   }): UplcProgramV2
  * }} Program
  */
@@ -106,9 +108,12 @@ export class CompilerLib_v0_17 {
             ...(onCompileUserFunc
                 ? {
                       onCompileUserFunc: (name, uplc) => {
+                          const alt = uplc.alt
+
                           onCompileUserFunc(
                               name,
                               bytesToHex(uplc.toCbor()),
+                              alt ? bytesToHex(alt.toCbor()) : None,
                               "PlutusScriptV2"
                           )
                       }

package/src/context/DagCompiler.js

@@ -116,15 +116,7 @@ export class DagCompiler {
                 dependsOnOwnHash: validator.$dependsOnOwnHash,
                 parameters: parameters,
                 isTestnet: isTestnet,
-                excludeUserFuncs: excludeUserFuncs,
-                onCompileUserFunc: (name, cborHex, plutusVersion) => {
-                    // this compilation process is potentially very slow, so print messages indicating progress
-                    console.log(`Compiled user function ${name}`)
-                    this.cachedUserFuncs[name] = restoreUplcProgram(
-                        plutusVersion,
-                        cborHex
-                    )
-                }
+                excludeUserFuncs: excludeUserFuncs
             })
 
             // this compilation process is potentially very slow, so print messages indicating progress
@@ -162,14 +154,26 @@ export class DagCompiler {
                     parameters: parameters,
                     isTestnet: isTestnet,
                     excludeUserFuncs: excludeUserFuncs,
-                    onCompileUserFunc: (name, cborHex, plutusVersion) => {
-                        const prev = /** @type {any} */ (
-                            expectSome(this.cachedUserFuncs[name])
-                        )
-
-                        this.cachedUserFuncs[name] = prev.withAlt(
-                            restoreUplcProgram(plutusVersion, cborHex)
-                        )
+                    onCompileUserFunc: (
+                        name,
+                        cborHex,
+                        cborHexAlt,
+                        plutusVersion
+                    ) => {
+                        let uplc = restoreUplcProgram(plutusVersion, cborHex)
+
+                        if (cborHexAlt) {
+                            uplc = uplc.withAlt(
+                                /**  @type {any} */ (
+                                    restoreUplcProgram(
+                                        plutusVersion,
+                                        cborHexAlt
+                                    )
+                                )
+                            )
+                        }
+
+                        this.cachedUserFuncs[name] = uplc
                     }
                 }
             )
@@ -188,8 +192,85 @@ export class DagCompiler {
             this.addValidatorToCache(validator, completeProgram, ownHash)
         }
 
+        /**
+         * @param {LoadedValidator} validator
+         */
+        const buildValidatorAltAndUserFuncs = (validator) => {
+            const hashDepHashes = this.getHashDepHashes(
+                validator,
+                Object.keys(hashTypes)
+            )
+            const moduleDeps = getModuleDependencies(validator)
+            const excludeUserFuncs = new Set(Object.keys(this.cachedUserFuncs))
+
+            const optimizedHash = expectSome(
+                this.cachedValidators[validator.$name]
+            )
+            const optimizedHashHex = optimizedHash.toHex()
+            const optimizedProgram = optimizedHash.context.program
+
+            // unoptimized compilation (so traces are untouched)
+            const {
+                cborHex: unoptimizedCborHex,
+                plutusVersion: unoptimPlutusVersion
+            } = this.lib.compile(
+                validator.$sourceCode,
+                Array.from(moduleDeps.values()),
+                {
+                    optimize: false,
+                    hashDependencies: hashDepHashes,
+                    allValidatorHashTypes: hashTypes,
+                    ownHash: validator.$dependsOnOwnHash
+                        ? optimizedHashHex
+                        : undefined,
+                    parameters: parameters,
+                    isTestnet: isTestnet,
+                    excludeUserFuncs: excludeUserFuncs,
+                    onCompileUserFunc: (
+                        name,
+                        cborHex,
+                        cborHexAlt,
+                        plutusVersion
+                    ) => {
+                        let uplc = restoreUplcProgram(plutusVersion, cborHex)
+
+                        if (cborHexAlt) {
+                            uplc = uplc.withAlt(
+                                /**  @type {any} */ (
+                                    restoreUplcProgram(
+                                        plutusVersion,
+                                        cborHexAlt
+                                    )
+                                )
+                            )
+                        }
+
+                        this.cachedUserFuncs[name] = uplc
+                    }
+                }
+            )
+
+            // TODO: with source mapping
+            const unoptimizedProgram = restoreUplcProgram(
+                unoptimPlutusVersion,
+                unoptimizedCborHex
+            )
+
+            const completeProgram = optimizedProgram.withAlt(
+                /** @type {any} */ (unoptimizedProgram)
+            )
+
+            this.addValidatorToCache(
+                validator,
+                completeProgram,
+                optimizedHashHex
+            )
+        }
+
         validators.forEach((v) => buildValidator(v))
 
+        validators.forEach((v) => buildValidatorAltAndUserFuncs(v))
+
         return {
             validators: this.cachedValidators,
             userFuncs: this.cachedUserFuncs
@@ -269,7 +350,11 @@ export class DagCompiler {
 
         allValidators.forEach((v) => {
             if (!(v in hashes)) {
-                hashes[v] = "#"
+                if (v in this.cachedValidators) {
+                    hashes[v] = `#${this.cachedValidators[v].toHex()}`
+                } else {
+                    hashes[v] = "#"
+                }
             }
         })
 

package/types/compiler/CompilerLib.d.ts

@@ -19,7 +19,7 @@
  *   isTestnet: boolean
  *   optimize: boolean
  *   excludeUserFuncs?: Set<string>
- *   onCompileUserFunc?: (name: string, cborHex: string, plutusVersion: PlutusVersion) => void
+ *   onCompileUserFunc?: (name: string, cborHex: string, altCborHex: Option<string>, plutusVersion: PlutusVersion) => void
  * }} CompileOptions
  */
 /**
@@ -79,7 +79,7 @@ export type CompileOptions = {
     isTestnet: boolean;
     optimize: boolean;
     excludeUserFuncs?: Set<string> | undefined;
-    onCompileUserFunc?: ((name: string, cborHex: string, plutusVersion: PlutusVersion) => void) | undefined;
+    onCompileUserFunc?: ((name: string, cborHex: string, altCborHex: Option<string>, plutusVersion: PlutusVersion) => void) | undefined;
 };
 export type CompileOutput = {
     cborHex: string;

package/types/compiler/CompilerLib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompilerLib.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;GAaG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;GAUG;AAEH;;GAEG;AAEH;;;;GAIG;AACH,uCAJW,WAAW,cACX,MAAM,EAAE;;EAUlB;4BA5EY,OAAO,mBAAmB,EAAE,aAAa;uBACzC,OAAO,mBAAmB,EAAE,QAAQ;kCACpC,OAAO,qBAAqB,EAAE,UAAU;gCACxC,OAAO,qBAAqB,EAAE,iBAAiB;mCAC/C,OAAO,qBAAqB,EAAE,oBAAoB;6BAIlD,GAAG;;2BAKY,OAAO,MAAM,EAAE,cAAc,CAAC;;sBAEnC,OAAO,MAAM,EAAE,MAAM,CAAC;;;;eAI7B,OAAO;cACR,OAAO;;gCAEU,MAAM,WAAW,MAAM,iBAAiB,aAAa,KAAK,IAAI;;4BAKjF;IACZ,OAAW,EAAE,MAAM,CAAA;IACnB,aAAiB,EAAE,aAAa,CAAA;CAC7B;;;;;;;;;4BAWS;IACZ,MAAU,MAAM,CAAA;IAChB,OAAW,EAAE,MAAM,CAAA;IACnB,UAAc,EAAE,MAAM,CAAA;CACnB;;aAKU,MAAM;iCACc,MAAM,KAAK,cAAc;4BAC9B,MAAM,EAAE,WAAW,MAAM,EAAE;;;;;;;;oBAInC,MAAM,WAAW,MAAM,EAAE,WAAW,cAAc,KAAK,aAAa;;8BAK5E,OAAO,MAAM,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"CompilerLib.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;GAaG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;GAUG;AAEH;;GAEG;AAEH;;;;GAIG;AACH,uCAJW,WAAW,cACX,MAAM,EAAE;;EAUlB;4BA5EY,OAAO,mBAAmB,EAAE,aAAa;uBACzC,OAAO,mBAAmB,EAAE,QAAQ;kCACpC,OAAO,qBAAqB,EAAE,UAAU;gCACxC,OAAO,qBAAqB,EAAE,iBAAiB;mCAC/C,OAAO,qBAAqB,EAAE,oBAAoB;6BAIlD,GAAG;;2BAKY,OAAO,MAAM,EAAE,cAAc,CAAC;;sBAEnC,OAAO,MAAM,EAAE,MAAM,CAAC;;;;eAI7B,OAAO;cACR,OAAO;;gCAEU,MAAM,WAAW,MAAM,cAAc,OAAO,MAAM,CAAC,iBAAiB,aAAa,KAAK,IAAI;;4BAK7G;IACZ,OAAW,EAAE,MAAM,CAAA;IACnB,aAAiB,EAAE,aAAa,CAAA;CAC7B;;;;;;;;;4BAWS;IACZ,MAAU,MAAM,CAAA;IAChB,OAAW,EAAE,MAAM,CAAA;IACnB,UAAc,EAAE,MAAM,CAAA;CACnB;;aAKU,MAAM;iCACc,MAAM,KAAK,cAAc;4BAC9B,MAAM,EAAE,WAAW,MAAM,EAAE;;;;;;;;oBAInC,MAAM,WAAW,MAAM,EAAE,WAAW,cAAc,KAAK,aAAa;;8BAK5E,OAAO,MAAM,EAAE,MAAM,EAAE,CAAC"}

package/types/compiler/CompilerLib_v0_17.d.ts

@@ -1,5 +1,6 @@
 /**
  * @typedef {import("@helios-lang/uplc").UplcData} UplcData
+ * @typedef {import("@helios-lang/uplc").UplcProgramV2I} UplcProgramV2I
  * @typedef {import("./CompilerLib.js").CompilerLib} CompilerLib
  * @typedef {import("./CompilerLib.js").CompileOptions} CompileOptions
  * @typedef {import("./CompilerLib.js").CompileOutput} CompileOutput
@@ -17,7 +18,7 @@
  *     hashDependencies?: Record<string, string>
  *     validatorIndices?: Record<string, number>
  *     excludeUserFuncs?: Set<string>
- *     onCompileUserFunc?: (name: string, uplc: UplcProgramV2) => void
+ *     onCompileUserFunc?: (name: string, uplc: UplcProgramV2I) => void
  *   }): UplcProgramV2
  * }} Program
  */
@@ -58,6 +59,7 @@ export class CompilerLib_v0_17 implements CompilerLib {
     typeCheck(validatorSources: string[], moduleSources: string[]): TypeCheckOutput;
 }
 export type UplcData = import("@helios-lang/uplc").UplcData;
+export type UplcProgramV2I = import("@helios-lang/uplc").UplcProgramV2I;
 export type CompilerLib = import("./CompilerLib.js").CompilerLib;
 export type CompileOptions = import("./CompilerLib.js").CompileOptions;
 export type CompileOutput = import("./CompilerLib.js").CompileOutput;
@@ -73,7 +75,7 @@ export type Program = {
         hashDependencies?: Record<string, string> | undefined;
         validatorIndices?: Record<string, number> | undefined;
         excludeUserFuncs?: Set<string> | undefined;
-        onCompileUserFunc?: ((name: string, uplc: UplcProgramV2) => void) | undefined;
+        onCompileUserFunc?: ((name: string, uplc: UplcProgramV2I) => void) | undefined;
     }): UplcProgramV2;
 };
 import { UplcProgramV2 } from "@helios-lang/uplc";

package/types/compiler/CompilerLib_v0_17.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompilerLib_v0_17.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib_v0_17.js"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;GAEG;AACH;IAOI;;OAEG;IACH,iBAFW,GAAG,EAIb;IAXD;;;OAGG;IACH,YAAG;IASH;;OAEG;IACH,sBAEC;IAED;;;OAGG;IACH,2BAHW,MAAM,GACJ,cAAc,CAM1B;IAED;;;;;OAKG;IACH,oBALW,MAAM,iBACN,MAAM,EAAE,WACR,cAAc,GACZ,aAAa,CAwDzB;IAED;;;;OAIG;IACH,4BAJW,MAAM,EAAE,iBACR,MAAM,EAAE,GACN,eAAe,CAM3B;CACJ;uBAlIY,OAAO,mBAAmB,EAAE,QAAQ;0BACpC,OAAO,kBAAkB,EAAE,WAAW;6BACtC,OAAO,kBAAkB,EAAE,cAAc;4BACzC,OAAO,kBAAkB,EAAE,aAAa;6BACxC,OAAO,kBAAkB,EAAE,cAAc;8BACzC,OAAO,kBAAkB,EAAE,eAAe;;UAK5C,MAAM;wBACQ,OAAO,MAAM,CAAC;qBACjB,MAAM,SAAS,QAAQ,GAAG,IAAI;;;;;;;oCAOlB,MAAM,QAAQ,aAAa,KAAK,IAAI;QAC7D,aAAa;;8BAvBQ,mBAAmB"}
+{"version":3,"file":"CompilerLib_v0_17.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib_v0_17.js"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;GAEG;AACH;IAOI;;OAEG;IACH,iBAFW,GAAG,EAIb;IAXD;;;OAGG;IACH,YAAG;IASH;;OAEG;IACH,sBAEC;IAED;;;OAGG;IACH,2BAHW,MAAM,GACJ,cAAc,CAM1B;IAED;;;;;OAKG;IACH,oBALW,MAAM,iBACN,MAAM,EAAE,WACR,cAAc,GACZ,aAAa,CA2DzB;IAED;;;;OAIG;IACH,4BAJW,MAAM,EAAE,iBACR,MAAM,EAAE,GACN,eAAe,CAM3B;CACJ;uBAtIY,OAAO,mBAAmB,EAAE,QAAQ;6BACpC,OAAO,mBAAmB,EAAE,cAAc;0BAC1C,OAAO,kBAAkB,EAAE,WAAW;6BACtC,OAAO,kBAAkB,EAAE,cAAc;4BACzC,OAAO,kBAAkB,EAAE,aAAa;6BACxC,OAAO,kBAAkB,EAAE,cAAc;8BACzC,OAAO,kBAAkB,EAAE,eAAe;;UAK5C,MAAM;wBACQ,OAAO,MAAM,CAAC;qBACjB,MAAM,SAAS,QAAQ,GAAG,IAAI;;;;;;;oCAOlB,MAAM,QAAQ,cAAc,KAAK,IAAI;QAC9D,aAAa;;8BAxBQ,mBAAmB"}

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

@@ -1 +1 @@
-{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AA0UA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AAvVD;;;;;;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,sDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CA0H7B;IAED;;;;;OAKG;IACH,4BAsCC;IAED;;;;;OAKG;IACH,yBA0BC;IAED;;;;;OAKG;IACH,qBAoBC;IAED;;;;;OAKG;IACH,4BAeC;CACJ;0BA5TY,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":"AA+ZA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AA5aD;;;;;;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,sDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CA2M7B;IAED;;;;;OAKG;IACH,4BAsCC;IAED;;;;;OAKG;IACH,yBA8BC;IAED;;;;;OAKG;IACH,qBAoBC;IAED;;;;;OAKG;IACH,4BAeC;CACJ;0BAjZY,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"}