@harmoniclabs/buildooor 0.1.28 → 0.1.30

package/dist/TxBuilder/TxBuilder.d.ts

@@ -56,7 +56,7 @@ export declare class TxBuilder {
      * 3) `tx.witnesses.vkeyWitnesses` (empty)
      */
     overrideTxRedeemers(tx: Tx, newRedeemers: TxRedeemer[], opts?: CostModelsToLanguageViewCborOpts): Tx;
-    buildSync(buildArgs: ITxBuildArgs, { onScriptInvalid, onScriptResult }?: ITxBuildSyncOptions): Tx;
+    buildSync(buildArgs: ITxBuildArgs, { onScriptInvalid, onScriptResult, ...otps }?: ITxBuildSyncOptions): Tx;
     validatePhaseTwoVerbose(tx: Tx): {
         result: CEKValue;
         budgetSpent: ExBudget;

package/dist/TxBuilder/TxBuilder.js

@@ -310,7 +310,8 @@ var TxBuilder = /** @class */ (function () {
     };
     TxBuilder.prototype.buildSync = function (buildArgs, _a) {
         var _b;
-        var _c = _a === void 0 ? {} : _a, onScriptInvalid = _c.onScriptInvalid, onScriptResult = _c.onScriptResult;
+        if (_a === void 0) { _a = {}; }
+        var onScriptInvalid = _a.onScriptInvalid, onScriptResult = _a.onScriptResult, otps = __rest(_a, ["onScriptInvalid", "onScriptResult"]);
         var _initBuild = this.initTxBuild(buildArgs);
         var 
         // tx,
@@ -334,7 +335,7 @@ var TxBuilder = /** @class */ (function () {
             executionUnitPrices.priceMemory,
             executionUnitPrices.priceSteps,
         ];
-        var _d = __read(executionUnitPrices, 2), memRational = _d[0], cpuRational = _d[1];
+        var _c = __read(executionUnitPrices, 2), memRational = _c[0], cpuRational = _c[1];
         memRational = typeof memRational === "number" ? cbor_1.CborPositiveRational.fromNumber(memRational) : memRational;
         cpuRational = typeof cpuRational === "number" ? cbor_1.CborPositiveRational.fromNumber(cpuRational) : cpuRational;
         // group by purpose so we can use the redeemer index to find the script
@@ -345,12 +346,16 @@ var TxBuilder = /** @class */ (function () {
         var voteScriptsToExec = scriptsToExec.filter(function (elem) { return elem.rdmrTag === cardano_ledger_ts_1.TxRedeemerTag.Voting; });
         var proposeScriptsToExec = scriptsToExec.filter(function (elem) { return elem.rdmrTag === cardano_ledger_ts_1.TxRedeemerTag.Proposing; });
         var maxRound = 3;
+        var defaultRounds = 1;
         var _isScriptValid = true;
         var fee = minFee;
         var prevFee;
+        var nRounds = (typeof otps.nScriptExecitionRounds === "number" ?
+            Math.max(0, Math.min(otps.nScriptExecitionRounds, maxRound))
+            : defaultRounds);
         var _loop_1 = function (round) {
             prevFee = fee;
-            var _e = (0, toOnChain_1.getTxInfos)(tx, this_1.genesisInfos), txInfosV1 = _e.v1, txInfosV2 = _e.v2, txInfosV3 = _e.v3;
+            var _d = (0, toOnChain_1.getTxInfos)(tx, this_1.genesisInfos), txInfosV1 = _d.v1, txInfosV2 = _d.v2, txInfosV3 = _d.v3;
             var totExBudget = new plutus_machine_1.ExBudget({ mem: 0, cpu: 0 });
             var _loop_2 = function (i) {
                 var rdmr = rdmrs[i];
@@ -379,7 +384,7 @@ var TxBuilder = /** @class */ (function () {
                     _isScriptValid = onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, isV2OrLess ? [
                         rdmrData,
                         ctxData
-                    ] : [ctxData], rdmrs, script.hash.toString(), onScriptResult, onScriptInvalid);
+                    ] : [ctxData], rdmrs, script.hash.toString(), tx, onScriptResult, onScriptInvalid);
                 };
                 if (tag === cardano_ledger_ts_1.TxRedeemerTag.Spend) {
                     var entry = spendScriptsToExec.find(function (_a) {
@@ -396,14 +401,14 @@ var TxBuilder = /** @class */ (function () {
                     if (typeof expectedVersion !== "string")
                         throw new Error("unexpected redeemer for native script");
                     var ctxData = getCtx(script.type, (0, getSpendingPurposeData_1.getSpendingPurposeData)(rdmr, tx.body, expectedVersion), (0, getSpendingPurposeData_1.getScriptInfoData)(rdmr, tx.body, expectedVersion, datum), rdmrData, txInfosV1, txInfosV2, txInfosV3);
-                    var _f = cek.eval(isV2OrLess ?
+                    var _e = cek.eval(isV2OrLess ?
                         new uplc_1.Application(new uplc_1.Application(new uplc_1.Application(getScriptLikeUplc(script), uplc_1.UPLCConst.data(datum)), uplc_1.UPLCConst.data(rdmrData)), uplc_1.UPLCConst.data(ctxData)) :
-                        new uplc_1.Application(getScriptLikeUplc(script), uplc_1.UPLCConst.data(ctxData))), result = _f.result, budgetSpent = _f.budgetSpent, logs = _f.logs;
+                        new uplc_1.Application(getScriptLikeUplc(script), uplc_1.UPLCConst.data(ctxData))), result = _e.result, budgetSpent = _e.budgetSpent, logs = _e.logs;
                     _isScriptValid = onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, isV2OrLess ? [
                         datum,
                         rdmrData,
                         ctxData
-                    ] : [ctxData], rdmrs, script.hash.toString(), onScriptResult, onScriptInvalid);
+                    ] : [ctxData], rdmrs, script.hash.toString(), tx, onScriptResult, onScriptInvalid);
                 }
                 else if (tag === cardano_ledger_ts_1.TxRedeemerTag.Mint)
                     onlyRedeemerArg(mintScriptsToExec);
@@ -451,7 +456,7 @@ var TxBuilder = /** @class */ (function () {
             totExBudget = new plutus_machine_1.ExBudget({ mem: 0, cpu: 0 });
         };
         var this_1 = this;
-        for (var round = 0; round < maxRound; round++) {
+        for (var round = 0; round < nRounds; round++) {
             var state_1 = _loop_1(round);
             if (state_1 === "break")
                 break;
@@ -1238,17 +1243,17 @@ 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, scritHashStr, onScriptResult, onScriptInvalid) {
+function onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, callArgs, rdmrs, scritHashStr, tx, onScriptResult, onScriptInvalid) {
     var _isScriptValid = true;
     if (typeof onScriptResult === "function")
-        onScriptResult(rdmr.clone(), result, budgetSpent.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }), scritHashStr);
+        onScriptResult(rdmr.clone(), result, budgetSpent.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }), scritHashStr, tx);
     if (result instanceof uplc_1.ErrorUPLC ||
         (function (resultKeys) {
             return resultKeys.includes("msg") &&
                 resultKeys.includes("addInfos");
         })(Object.keys(result))) {
         if (typeof onScriptInvalid === "function") {
-            onScriptInvalid(rdmr.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }));
+            onScriptInvalid(rdmr.clone(), logs.slice(), callArgs.map(function (d) { return d.clone(); }), tx);
             // _isScriptValid = false;
         }
         else {

package/dist/txBuild/ITxBuildOptions.d.ts

@@ -3,6 +3,11 @@ import { Data } from "@harmoniclabs/plutus-data";
 import { ExBudget } from "@harmoniclabs/plutus-machine";
 import { PureUPLCTerm } from "@harmoniclabs/uplc";
 export interface ITxBuildSyncOptions {
+    /**
+     * @default 1
+     * @max 3
+    **/
+    nScriptExecitionRounds?: number;
     onScriptInvalid?: (rdmr: TxRedeemer, logs: string[], callArgs: Data[]) => void;
     onScriptResult?: (rdmr: TxRedeemer, result: PureUPLCTerm, exBudget: ExBudget, logs: string[], callArgs: Data[]) => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@harmoniclabs/buildooor",
-    "version": "0.1.28",
+    "version": "0.1.30",
     "description": "Cardano transaction builder in typescript",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -45,25 +45,25 @@
     "homepage": "https://github.com/HarmonicLabs/plu-ts#readme",
     "dependencies": {
         "@harmoniclabs/bigint-utils": "^1.0.0",
-        "@harmoniclabs/crypto": "^0.3.0",
-        "@harmoniclabs/obj-utils": "^1.0.0",
-        "@harmoniclabs/uint8array-utils": "^1.0.4",
         "@harmoniclabs/bip32_ed25519": "^0.1.3",
         "@harmoniclabs/bytestring": "^1.0.0",
         "@harmoniclabs/cardano-costmodels-ts": "^1.3.0",
-        "@harmoniclabs/cardano-ledger-ts": "^0.4.6",
+        "@harmoniclabs/cardano-ledger-ts": "^0.4.8",
         "@harmoniclabs/cbor": "^1.6.6",
+        "@harmoniclabs/crypto": "^0.3.0",
+        "@harmoniclabs/obj-utils": "^1.0.0",
         "@harmoniclabs/pair": "^1.0.0",
         "@harmoniclabs/plutus-data": "^1.2.6",
-        "@harmoniclabs/plutus-machine": "^2.1.2",
+        "@harmoniclabs/plutus-machine": "^2.1.3",
+        "@harmoniclabs/uint8array-utils": "^1.0.4",
         "@harmoniclabs/uplc": "^1.4.1"
     },
     "devDependencies": {
         "@babel/preset-env": "^7.18.6",
         "@babel/preset-typescript": "^7.18.6",
-        "@types/jest": "^28.1.4",
+        "@types/jest": "^30.0.0",
         "@types/node": "^18.14.6",
-        "jest": "^29.4.3",
+        "jest": "^30.2.0",
         "jest-environment-jsdom": "^29.4.3",
         "tsc-alias": "^1.7.1",
         "typescript": "^4.6.3"