@harmoniclabs/buildooor 0.1.18 → 0.1.20

package/dist/TxBuilder/TxBuilder.js

@@ -379,7 +379,7 @@ var TxBuilder = /** @class */ (function () {
                     _isScriptValid = onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, isV2OrLess ? [
                         rdmrData,
                         ctxData
-                    ] : [ctxData], rdmrs, onScriptResult, onScriptInvalid);
+                    ] : [ctxData], rdmrs, script.hash.toString(), onScriptResult, onScriptInvalid);
                 };
                 if (tag === cardano_ledger_ts_1.TxRedeemerTag.Spend) {
                     var entry = spendScriptsToExec.find(function (_a) {
@@ -403,7 +403,7 @@ var TxBuilder = /** @class */ (function () {
                         datum,
                         rdmrData,
                         ctxData
-                    ] : [ctxData], rdmrs, onScriptResult, onScriptInvalid);
+                    ] : [ctxData], rdmrs, script.hash.toString(), onScriptResult, onScriptInvalid);
                 }
                 else if (tag === cardano_ledger_ts_1.TxRedeemerTag.Mint)
                     onlyRedeemerArg(mintScriptsToExec);
@@ -1238,15 +1238,10 @@ function getCtx(scriptType, spendingPurpose, scriptInfo, redeemerData, txInfosV1
     else
         throw new Error("unexpected native script execution");
 }
-function onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, callArgs, rdmrs, onScriptResult, onScriptInvalid) {
+function onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, callArgs, rdmrs, scritHashStr, onScriptResult, onScriptInvalid) {
     var _isScriptValid = true;
-    // artificially add some budget to allow for small exec costs errors
-    // TODO: fix `plutus-machine` evaluation
-    // budgetSpent.add({
-    //     cpu: 100_000,
-    //     mem: 10_000
-    // });
-    onScriptResult && onScriptResult(rdmr.clone(), result, budgetSpent.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }));
+    if (typeof onScriptResult === "function")
+        onScriptResult(rdmr.clone(), result, budgetSpent.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }), scritHashStr);
     if (result instanceof uplc_1.ErrorUPLC ||
         (function (resultKeys) {
             return resultKeys.includes("msg") &&
@@ -1254,25 +1249,32 @@ function onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, cal
         })(Object.keys(result))) {
         if (typeof onScriptInvalid === "function") {
             onScriptInvalid(rdmr.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }));
-            _isScriptValid = false;
+            // _isScriptValid = false;
         }
         else {
-            throw new Error("script consumed with ".concat((0, cardano_ledger_ts_1.txRedeemerTagToString)(rdmr.tag), " redemer ") +
-                "and index '".concat(rdmr.index.toString(), "'\n\n") +
-                "called with data arguments:\n".concat(callArgs
-                    .map(function (d, i) {
-                    return i.toString() + ": " + (0, plutus_data_1.dataToCbor)(d).toString();
-                })
-                    .join("\n"), "\n\n") +
-                "failed with \n" +
-                "error message: ".concat(result.msg, "\n") +
-                "additional infos: ".concat((0, stringify_1.stringify)(result.addInfos, function (k, v) {
+            var callArgsStr = (callArgs
+                .map(function (d, i) {
+                return i.toString() + ": " + (0, plutus_data_1.dataToCbor)(d).toString();
+            })
+                .join("\n"));
+            var errorMsg = result === null || result === void 0 ? void 0 : result.msg;
+            var addInfosStr = "<error while serializing additional infos>";
+            try {
+                addInfosStr = (0, stringify_1.stringify)(result === null || result === void 0 ? void 0 : result.addInfos, function (k, v) {
                     if ((0, uint8array_utils_1.isUint8Array)(v))
                         return (0, uint8array_utils_1.toHex)(v);
                     if (typeof v === "bigint")
                         return v.toString();
                     return v;
-                }), "\n") +
+                });
+            }
+            catch (_a) { }
+            throw new Error("script '".concat(scritHashStr, "' consumed with ").concat((0, cardano_ledger_ts_1.txRedeemerTagToString)(rdmr.tag), " redemer ") +
+                "and index '".concat(rdmr.index.toString(), "'\n\n") +
+                "called with data arguments:\n".concat(callArgsStr, "\n\n") +
+                "failed with \n" +
+                "error message: ".concat(errorMsg, "\n") +
+                "additional infos: ".concat(addInfosStr, "\n") +
                 "script execution logs: [".concat(logs.toString(), "]\n"));
         }
     }

package/dist/utils/stringify.d.ts

@@ -1,2 +1,2 @@
-export declare function mkReplacer(replacer?: (key: string, value: any) => any | null, map?: WeakMap<any, string>): (key: string, value: any) => any;
+export declare function mkReplacer(replacer?: (key: string, value: any) => any | null, seen?: WeakSet<any>): (key: string, value: any) => any;
 export declare function stringify(value: any, replacer?: (key: string, value: any) => any | null | (number | string)[], space?: string | number): string;

package/dist/utils/stringify.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringify = exports.mkReplacer = void 0;
 var obj_utils_1 = require("@harmoniclabs/obj-utils");
 var uint8array_utils_1 = require("@harmoniclabs/uint8array-utils");
-function mkReplacer(replacer, map) {
-    if (map === void 0) { map = new WeakMap(); }
+function mkReplacer(replacer, seen) {
+    if (seen === void 0) { seen = new WeakSet(); }
     if (typeof replacer !== "function")
         replacer = function (k, v) { return v; };
     return function (key, value) {
         value = replacer(key, value);
         if ((0, obj_utils_1.isObject)(value)) {
-            if (map.has(value)) {
-                return map.get(value);
+            if (seen.has(value)) {
+                return undefined;
             }
-            map.set(value, key);
+            seen.add(value);
             if (typeof value.buffer === "object" && value.buffer instanceof ArrayBuffer) {
                 value = new Uint8Array(value.buffer);
             }
@@ -30,9 +30,6 @@ function mkReplacer(replacer, map) {
 exports.mkReplacer = mkReplacer;
 function stringify(value, replacer, space) {
     if (space === void 0) { space = 0; }
-    if (replacer) {
-        return JSON.stringify(value, replacer, space);
-    }
-    return JSON.stringify(value, mkReplacer(replacer, new WeakMap()), space);
+    return JSON.stringify(value, mkReplacer(replacer, new WeakSet()), space);
 }
 exports.stringify = stringify;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@harmoniclabs/buildooor",
-    "version": "0.1.18",
+    "version": "0.1.20",
     "description": "Cardano transaction builder in typescript",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -51,7 +51,7 @@
         "@harmoniclabs/bip32_ed25519": "^0.1.3",
         "@harmoniclabs/bytestring": "^1.0.0",
         "@harmoniclabs/cardano-costmodels-ts": "^1.3.0",
-        "@harmoniclabs/cardano-ledger-ts": "^0.4.0-dev13",
+        "@harmoniclabs/cardano-ledger-ts": "^0.4.0-dev14",
         "@harmoniclabs/cbor": "^1.6.6",
         "@harmoniclabs/pair": "^1.0.0",
         "@harmoniclabs/plutus-data": "^1.2.6",