@helios-lang/contract-utils 0.2.21 → 0.2.23

package/package.json

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

package/src/cast/UserFunc.js

@@ -16,6 +16,7 @@ import { ConstrData, UplcDataValue } from "@helios-lang/uplc"
  *     type: TypeSchema
  *   }[]
  *   returns: TypeSchema
+ *   validatorIndices?: Record<string, number>
  * }} UserFuncProps
  */
 
@@ -71,11 +72,12 @@ export class UserFunc {
                         namedArgs["$currentScript"]
                     )
 
-                    console.error(
-                        `TODO: convert ${currentScriptName} to correct ConstrData`
+                    const index = expectSome(
+                        expectSome(this.props.validatorIndices)[
+                            currentScriptName
+                        ]
                     )
-
-                    args.push(new ConstrData(0, []))
+                    args.push(new ConstrData(index, []))
                 }
 
                 const result = this.uplc.eval(

package/src/codegen/LoadedScriptsWriter.js

@@ -1,4 +1,5 @@
 import { StringWriter } from "@helios-lang/codec-utils"
+import { isSome } from "@helios-lang/type-utils"
 import { genTypes } from "./TypeSchema.js"
 
 /**
@@ -101,6 +102,8 @@ export class LoadedScriptsWriter {
             todo = todoNext
         }
 
+        this.writeValidatorIndices(validators)
+
         return this
     }
 
@@ -240,14 +243,19 @@ export class LoadedScriptsWriter {
             const fn = functions[key]
             const t = genFuncType(fn)
 
+            let propsStr = JSON.stringify(fn)
+            if (fn.requiresCurrentScript) {
+                propsStr = `{...(${propsStr}), validatorIndices: __validatorIndices}`
+            }
+
             this.definition.write(
-                `        "${key}": (uplc) => /** @type {UserFunc<${t}>} */ (new UserFunc(uplc, ${JSON.stringify(fn)})),\n`
+                `        "${key}": (uplc) => /** @type {UserFunc<${t}>} */ (new UserFunc(uplc, ${propsStr})),\n`
             )
             this.declaration.write(
                 `        "${key}": (uplc) => UserFunc<${t}>,\n`
             )
             this.combined.write(
-                `        "${key}": (uplc) => new UserFunc<${t}>(uplc, ${JSON.stringify(fn)}),\n`
+                `        "${key}": (uplc) => new UserFunc<${t}>(uplc, ${propsStr}),\n`
             )
         }
 
@@ -298,11 +306,13 @@ export class LoadedScriptsWriter {
     writeValidator(v) {
         const redeemerTypes = genTypes(v.Redeemer)
         const datumTypes = v.Datum ? genTypes(v.Datum) : undefined
+        const currentScriptIndex = v.currentScriptIndex
 
         this.definition.write(
             `export const ${v.name} = {
     $name: /** @type {const} */ ("${v.name}"),
     $purpose: /** @type {const} */ ("${v.purpose}"),
+${isSome(currentScriptIndex) ? `    $currentScriptIndex: /** @type {const} */ (${currentScriptIndex}),\n` : ""}
     $sourceCode: ${JSON.stringify(v.sourceCode)},
     $dependencies: /** @type {const} */ ([${v.moduleDepedencies.join(", ")}]),
     $hashDependencies: [${v.hashDependencies.filter((d) => d != v.name).join(", ")}],
@@ -315,6 +325,7 @@ ${datumTypes ? `    $Datum: (config) => /** @type {Cast<${datumTypes[0]}, ${datu
             `export const ${v.name}: {
     $name: "${v.name}"
     $purpose: "${v.purpose}"
+${isSome(currentScriptIndex) ? `    $currentScriptIndex: ${currentScriptIndex},\n` : ""}
     $sourceCode: string
     $dependencies: [${v.moduleDepedencies.map((d) => `typeof ${d}`).join(", ")}]
     $hashDependencies: [${v.hashDependencies
@@ -330,6 +341,7 @@ ${datumTypes ? `    $Datum: ConfigurableCast<${datumTypes[0]}, ${datumTypes[1]}>
             `export const ${v.name} = {
     $name: "${v.name}" as const,
     $purpose: "${v.purpose}" as const,
+${isSome(currentScriptIndex) ? `    $currentScriptIndex: ${currentScriptIndex} as const,\n` : ""}
     $sourceCode: ${JSON.stringify(v.sourceCode)} as string,
     $dependencies: [${v.moduleDepedencies.join(", ")}] as const,
     $hashDependencies: [${v.hashDependencies.filter((d) => d != v.name).join(", ")}],
@@ -345,6 +357,32 @@ ${datumTypes ? `    $Datum: (config: CastConfig) => new Cast<${datumTypes[0]}, $
         this.declaration.write(`}\n`)
         this.combined.write(`}\n`)
     }
+
+    /**
+     * @param {Record<string, TypeCheckedValidator>} validators
+     */
+    writeValidatorIndices(validators) {
+        /**
+         * @type {Record<string, number>}
+         */
+        const indices = {}
+
+        for (let name in validators) {
+            const v = validators[name]
+            if (isSome(v.currentScriptIndex)) {
+                indices[name] = v.currentScriptIndex
+            } else {
+                return
+            }
+        }
+
+        this.definition.write(
+            `const __validatorIndices = ${JSON.stringify(indices)};`
+        )
+        this.combined.write(
+            `const __validatorIndices: Record<string, number> = ${JSON.stringify(indices)};`
+        )
+    }
 }
 
 /**

package/src/codegen/LoadedValidator.js

@@ -18,6 +18,7 @@ import { UserFunc } from "../cast/UserFunc.js"
  *   $sourceCode: string
  *   $dependencies: ReadonlyArray<LoadedModule>
  *   $hashDependencies: ReadonlyArray<LoadedValidator>
+ *   $currentScriptIndex?: number
  *   $dependsOnOwnHash: boolean
  *   $types: {[name: string]: CastLike<any, any>}
  *   $functions: {[name: string]: (uplc: UplcProgram) => UserFunc<any>}

package/src/codegen/TypeCheckedValidator.js

@@ -8,6 +8,7 @@ export {}
 /**
  * @typedef {TypeCheckedModule & {
  *   hashDependencies: string[]
+ *   currentScriptIndex?: number
  *   Redeemer: TypeSchema
  *   Datum?: TypeSchema
  * }} TypeCheckedValidator

package/src/compiler/CompilerLib.js

@@ -16,8 +16,9 @@ export {}
 
 /**
  * @typedef {{
- *   allValidatorHashTypes: {[name: string]: ScriptHashType}
- *   hashDependencies: {[name: string]: string}
+ *   allValidatorHashTypes: Record<string, ScriptHashType>
+ *   allValidatorIndices?: Record<string, number>
+ *   hashDependencies: Record<string, string>
  *   dependsOnOwnHash?: boolean
  *   ownHash?: string
  *   parameters?: Record<string, UplcData>

package/src/compiler/CompilerLib_v0_17.js

@@ -13,11 +13,13 @@ import { UplcProgramV2 } from "@helios-lang/uplc"
 /**
  * @typedef {{
  *   name: string
+ *   currentScriptIndex: Option<number>
  *   changeParam(key: string, value: UplcData): void
  *   compile(options: {
  *     optimize?: boolean,
  *     dependsOnOwnHash?: boolean,
  *     hashDependencies?: Record<string, string>
+ *     validatorIndices?: Record<string, number>
  *     excludeUserFuncs?: Set<string>
  *     onCompileUserFunc?: (name: string, uplc: UplcProgramV2) => void
  *   }): UplcProgramV2
@@ -91,6 +93,7 @@ export class CompilerLib_v0_17 {
         const uplc = program.compile({
             optimize: options.optimize,
             dependsOnOwnHash: options.dependsOnOwnHash ?? false,
+            validatorIndices: options.allValidatorIndices,
             hashDependencies: {
                 ...options.hashDependencies,
                 ...(options.ownHash ? { [program.name]: options.ownHash } : {})

package/src/context/DagCompiler.js

@@ -4,7 +4,7 @@ import {
     StakingValidatorHash,
     ValidatorHash
 } from "@helios-lang/ledger"
-import { None, expectSome } from "@helios-lang/type-utils"
+import { None, expectSome, isSome } from "@helios-lang/type-utils"
 import { UplcProgramV1, UplcProgramV2 } from "@helios-lang/uplc"
 import { configureCast } from "../cast/index.js"
 
@@ -75,6 +75,7 @@ export class DagCompiler {
      */
     build(validators, parameters, isTestnet, expectedHashes = None) {
         const hashTypes = this.getHashTypes(validators)
+        const validatorIndices = this.getValidatorIndices(validators)
 
         /**
          * `buildValidator()` is a closure instead of a member method of DagCompiler
@@ -94,7 +95,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,8 +109,9 @@ export class DagCompiler {
                 moduleDeps,
                 {
                     optimize: true,
-                    hashDependencies: hashDeps,
+                    hashDependencies: hashDepHashes,
                     allValidatorHashTypes: hashTypes,
+                    allValidatorIndices: validatorIndices ?? undefined,
                     dependsOnOwnHash: validator.$dependsOnOwnHash,
                     parameters: parameters,
                     isTestnet: isTestnet,
@@ -140,7 +145,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 +241,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 +260,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
     }
 
     /**
@@ -287,6 +299,29 @@ export class DagCompiler {
 
         return res
     }
+
+    /**
+     * If any $currentScriptIndex is missing, None is returned
+     * @private
+     * @param {LoadedValidator[]} validators
+     * @returns {Option<Record<string, number>>}
+     */
+    getValidatorIndices(validators) {
+        /**
+         * @type {Record<string, number>}
+         */
+        const res = {}
+
+        for (let v of validators) {
+            if (isSome(v.$currentScriptIndex)) {
+                res[v.$name] = v.$currentScriptIndex
+            } else {
+                return None
+            }
+        }
+
+        return res
+    }
 }
 
 /**

package/types/cast/UserFunc.d.ts

@@ -7,6 +7,7 @@
  *     type: TypeSchema
  *   }[]
  *   returns: TypeSchema
+ *   validatorIndices?: Record<string, number>
  * }} UserFuncProps
  */
 /**
@@ -46,5 +47,6 @@ export type UserFuncProps = {
         type: TypeSchema;
     }[];
     returns: TypeSchema;
+    validatorIndices?: Record<string, number>;
 };
 //# sourceMappingURL=UserFunc.d.ts.map

package/types/cast/UserFunc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AASA;;;;;;;;;;GAUG;AAEH;;GAEG;AACH;IAeI;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IArBD;;;;OAIG;IACH,sBAAI;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,oBA4CC;CACJ;yBA/FY,OAAO,yBAAyB,EAAE,UAAU;uBAC5C,OAAO,mBAAmB,EAAE,QAAQ;0BACpC,OAAO,mBAAmB,EAAE,WAAW;4BAOvC;IACZ,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,MAAY,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;KACjB,EAAE,CAAA;IACP,OAAW,EAAE,UAAU,CAAA;CACpB"}
+{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AAEH;;GAEG;AACH;IAeI;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IArBD;;;;OAIG;IACH,sBAAI;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,oBA6CC;CACJ;yBAjGY,OAAO,yBAAyB,EAAE,UAAU;uBAC5C,OAAO,mBAAmB,EAAE,QAAQ;0BACpC,OAAO,mBAAmB,EAAE,WAAW;4BAOvC;IACZ,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,MAAY,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;KACjB,EAAE,CAAA;IACP,OAAW,EAAE,UAAU,CAAA;IACvB,gBAAoB,CAAC,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1C"}

package/types/codegen/LoadedScriptsWriter.d.ts

@@ -73,6 +73,10 @@ export class LoadedScriptsWriter {
      * @param {TypeCheckedValidator} v
      */
     private writeValidator;
+    /**
+     * @param {Record<string, TypeCheckedValidator>} validators
+     */
+    writeValidatorIndices(validators: Record<string, TypeCheckedValidator>): void;
 }
 export type TypeCheckedModule = import("./TypeCheckedModule.js").TypeCheckedModule;
 export type TypeCheckedUserFunc = import("./TypeCheckedModule.js").TypeCheckedUserFunc;

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

@@ -1 +1 @@
-{"version":3,"file":"LoadedScriptsWriter.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedScriptsWriter.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH;IAUI;;;OAGG;IACH,gBAFa,mBAAmB,CAQ/B;IAfG,yBAAoC;IACpC,0BAAqC;IACrC,uBAAkC;IAetC;;;OAGG;IACH;;QAFa,mBAAmB,CAgC/B;IAED;;;OAGG;IACH;;QAFa,mBAAmB,CAkC/B;IAED;;OAEG;IACH,YAFa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAQpC;IAED;;;;;OAKG;IACH,cAKC;IAED;;;;;OAKG;IACH,sBALW,MAAM,YACN,MAAM,eACN,MAAM,EAAE,GACN,mBAAmB,CAmB/B;IAED;;;;OAIG;IACH,kBAJW,MAAM,kBACN,MAAM,EAAE,GACN,mBAAmB,CAQ/B;IAED;;OAEG;IACH,qBA6BC;IAED;;OAEG;IACH,kBAFW,OAAO,MAAM,EAAE,UAAU,CAAC,QAyBpC;IAED;;OAEG;IACH,0BAFW,OAAO,MAAM,EAAE,mBAAmB,CAAC,QAyB7C;IAED;;;OAGG;IACH,oBA6BC;IAED;;;OAGG;IACH,uBAiDC;CACJ;gCAvVY,OAAO,wBAAwB,EAAE,iBAAiB;kCAClD,OAAO,wBAAwB,EAAE,mBAAmB;mCACpD,OAAO,2BAA2B,EAAE,oBAAoB;yBACxD,OAAO,iBAAiB,EAAE,UAAU;6BAPpB,0BAA0B"}
+{"version":3,"file":"LoadedScriptsWriter.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedScriptsWriter.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AAEH;IAUI;;;OAGG;IACH,gBAFa,mBAAmB,CAQ/B;IAfG,yBAAoC;IACpC,0BAAqC;IACrC,uBAAkC;IAetC;;;OAGG;IACH;;QAFa,mBAAmB,CAgC/B;IAED;;;OAGG;IACH;;QAFa,mBAAmB,CAoC/B;IAED;;OAEG;IACH,YAFa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAQpC;IAED;;;;;OAKG;IACH,cAKC;IAED;;;;;OAKG;IACH,sBALW,MAAM,YACN,MAAM,eACN,MAAM,EAAE,GACN,mBAAmB,CAmB/B;IAED;;;;OAIG;IACH,kBAJW,MAAM,kBACN,MAAM,EAAE,GACN,mBAAmB,CAQ/B;IAED;;OAEG;IACH,qBA6BC;IAED;;OAEG;IACH,kBAFW,OAAO,MAAM,EAAE,UAAU,CAAC,QAyBpC;IAED;;OAEG;IACH,0BAFW,OAAO,MAAM,EAAE,mBAAmB,CAAC,QA8B7C;IAED;;;OAGG;IACH,oBA6BC;IAED;;;OAGG;IACH,uBAqDC;IAED;;OAEG;IACH,kCAFW,OAAO,MAAM,EAAE,oBAAoB,CAAC,QAuB9C;CACJ;gCA5XY,OAAO,wBAAwB,EAAE,iBAAiB;kCAClD,OAAO,wBAAwB,EAAE,mBAAmB;mCACpD,OAAO,2BAA2B,EAAE,oBAAoB;yBACxD,OAAO,iBAAiB,EAAE,UAAU;6BARpB,0BAA0B"}

package/types/codegen/LoadedValidator.d.ts

@@ -9,6 +9,7 @@ export type LoadedValidator = {
     $sourceCode: string;
     $dependencies: ReadonlyArray<LoadedModule>;
     $hashDependencies: ReadonlyArray<LoadedValidator>;
+    $currentScriptIndex?: number | undefined;
     $dependsOnOwnHash: boolean;
     $types: {
         [name: string]: CastLike<any, any>;

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;;;;;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"}
+{"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;;uBAE9B,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;yBAjDjC,qBAAqB"}

package/types/codegen/TypeCheckedValidator.d.ts

@@ -2,6 +2,7 @@ export type TypeCheckedModule = import("./TypeCheckedModule.js").TypeCheckedModu
 export type TypeSchema = import("./TypeSchema.js").TypeSchema;
 export type TypeCheckedValidator = TypeCheckedModule & {
     hashDependencies: string[];
+    currentScriptIndex?: number;
     Redeemer: TypeSchema;
     Datum?: TypeSchema;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"TypeCheckedValidator.d.ts","sourceRoot":"","sources":["../../src/codegen/TypeCheckedValidator.js"],"names":[],"mappings":"gCAGa,OAAO,wBAAwB,EAAE,iBAAiB;yBAClD,OAAO,iBAAiB,EAAE,UAAU;mCAIpC,iBAAiB,GAAG;IAChC,gBAAoB,EAAE,MAAM,EAAE,CAAA;IAC9B,QAAY,EAAE,UAAU,CAAA;IACxB,KAAS,CAAC,EAAE,UAAU,CAAA;CACnB"}
+{"version":3,"file":"TypeCheckedValidator.d.ts","sourceRoot":"","sources":["../../src/codegen/TypeCheckedValidator.js"],"names":[],"mappings":"gCAGa,OAAO,wBAAwB,EAAE,iBAAiB;yBAClD,OAAO,iBAAiB,EAAE,UAAU;mCAIpC,iBAAiB,GAAG;IAChC,gBAAoB,EAAE,MAAM,EAAE,CAAA;IAC9B,kBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAY,EAAE,UAAU,CAAA;IACxB,KAAS,CAAC,EAAE,UAAU,CAAA;CACnB"}

package/types/compiler/CompilerLib.d.ts

@@ -10,8 +10,9 @@
  */
 /**
  * @typedef {{
- *   allValidatorHashTypes: {[name: string]: ScriptHashType}
- *   hashDependencies: {[name: string]: string}
+ *   allValidatorHashTypes: Record<string, ScriptHashType>
+ *   allValidatorIndices?: Record<string, number>
+ *   hashDependencies: Record<string, string>
  *   dependsOnOwnHash?: boolean
  *   ownHash?: string
  *   parameters?: Record<string, UplcData>
@@ -68,12 +69,9 @@ export type TypeCheckedModule = import("../codegen/index.js").TypeCheckedModule;
 export type TypeCheckedValidator = import("../codegen/index.js").TypeCheckedValidator;
 export type ScriptHashType = any;
 export type CompileOptions = {
-    allValidatorHashTypes: {
-        [name: string]: any;
-    };
-    hashDependencies: {
-        [name: string]: string;
-    };
+    allValidatorHashTypes: Record<string, ScriptHashType>;
+    allValidatorIndices?: Record<string, number> | undefined;
+    hashDependencies: Record<string, string>;
     dependsOnOwnHash?: boolean | undefined;
     ownHash?: string | undefined;
     parameters?: Record<string, import("@helios-lang/uplc").UplcData> | undefined;

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;;;;;;;;;;;;GAYG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;GAUG;AAEH;;GAEG;AAEH;;;;GAIG;AACH,uCAJW,WAAW,cACX,MAAM,EAAE;;EAUlB;4BA1EY,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;;;;;;;;;;;eAUA,OAAO;cACR,OAAO;;gCAEU,MAAM,WAAW,MAAM,iBAAiB,aAAa,KAAK,IAAI;;4BAKjF;IACZ,OAAW,EAAE,MAAM,CAAA;CAChB;;;;;;;;;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;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;GAUG;AAEH;;GAEG;AAEH;;;;GAIG;AACH,uCAJW,WAAW,cACX,MAAM,EAAE;;EAUlB;4BA3EY,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;CAChB;;;;;;;;;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

@@ -9,11 +9,13 @@
 /**
  * @typedef {{
  *   name: string
+ *   currentScriptIndex: Option<number>
  *   changeParam(key: string, value: UplcData): void
  *   compile(options: {
  *     optimize?: boolean,
  *     dependsOnOwnHash?: boolean,
  *     hashDependencies?: Record<string, string>
+ *     validatorIndices?: Record<string, number>
  *     excludeUserFuncs?: Set<string>
  *     onCompileUserFunc?: (name: string, uplc: UplcProgramV2) => void
  *   }): UplcProgramV2
@@ -63,11 +65,13 @@ export type ScriptHashType = import("./CompilerLib.js").ScriptHashType;
 export type TypeCheckOutput = import("./CompilerLib.js").TypeCheckOutput;
 export type Program = {
     name: string;
+    currentScriptIndex: Option<number>;
     changeParam(key: string, value: UplcData): void;
     compile(options: {
         optimize?: boolean | undefined;
         dependsOnOwnHash?: boolean | undefined;
         hashDependencies?: Record<string, string> | undefined;
+        validatorIndices?: Record<string, number> | undefined;
         excludeUserFuncs?: Set<string> | undefined;
         onCompileUserFunc?: ((name: string, uplc: UplcProgramV2) => void) | undefined;
     }): UplcProgramV2;

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;;;;;;;;;;;;GAYG;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,CAsDzB;IAED;;;;OAIG;IACH,4BAJW,MAAM,EAAE,iBACR,MAAM,EAAE,GACN,eAAe,CAM3B;CACJ;uBA9HY,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;qBACK,MAAM,SAAS,QAAQ,GAAG,IAAI;;;;;;oCAMlB,MAAM,QAAQ,aAAa,KAAK,IAAI;QAC7D,aAAa;;8BArBQ,mBAAmB"}
+{"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,CAuDzB;IAED;;;;OAIG;IACH,4BAJW,MAAM,EAAE,iBACR,MAAM,EAAE,GACN,eAAe,CAM3B;CACJ;uBAjIY,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"}

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
@@ -80,6 +81,13 @@ export class DagCompiler {
      * @returns {Record<string, any>}
      */
     private getHashTypes;
+    /**
+     * If any $currentScriptIndex is missing, None is returned
+     * @private
+     * @param {LoadedValidator[]} validators
+     * @returns {Option<Record<string, number>>}
+     */
+    private getValidatorIndices;
 }
 export type UplcProgram = import("@helios-lang/uplc").UplcProgram;
 export type CastConfig = import("../cast/index.js").CastConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AAmSA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AAjTD;;;;;;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,qBAoBC;CACJ;0BAtRY,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":"AAsUA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AApVD;;;;;;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,CAgI7B;IAED;;;;;OAKG;IACH,4BA6BC;IAED;;;;;OAKG;IACH,yBA0BC;IAED;;;;;OAKG;IACH,qBAoBC;IAED;;;;;OAKG;IACH,4BAeC;CACJ;0BAzTY,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"}