@harmoniclabs/buildooor 0.1.31 → 0.2.1

package/dist/TxBuilder/TxBuilder.d.ts

@@ -3,7 +3,7 @@ import { CostModelsToLanguageViewCborOpts } from "@harmoniclabs/cardano-costmode
 import { Tx, Value, TxOut, TxRedeemerTag, ScriptType, UTxO, TxRedeemer, TxWitnessSet, ScriptDataHash, ITxOut, ValueUnits } from "@harmoniclabs/cardano-ledger-ts";
 import { CanBeCborString } from "@harmoniclabs/cbor";
 import { Data } from "@harmoniclabs/plutus-data";
-import { ExBudget, CEKValue } from "@harmoniclabs/plutus-machine";
+import { ExBudget, CEKValueObj } from "@harmoniclabs/plutus-machine";
 import { ITxBuildArgs, ITxBuildOptions, ITxBuildInput, ITxBuildSyncOptions } from "../txBuild/index.js";
 import { CanBeUInteger } from "../utils/ints.js";
 import { TxBuilderRunner } from "./TxBuilderRunner/TxBuilderRunner.js";
@@ -58,7 +58,7 @@ export declare class TxBuilder {
     overrideTxRedeemers(tx: Tx, newRedeemers: TxRedeemer[], opts?: CostModelsToLanguageViewCborOpts): Tx;
     buildSync(buildArgs: ITxBuildArgs, { onScriptInvalid, onScriptResult, ...otps }?: ITxBuildSyncOptions): Tx;
     validatePhaseTwoVerbose(tx: Tx): {
-        result: CEKValue;
+        result: CEKValueObj;
         budgetSpent: ExBudget;
         logs: string[];
         rdmr: TxRedeemer;

package/dist/TxBuilder/TxBuilder.js

@@ -169,7 +169,7 @@ var TxBuilder = /** @class */ (function () {
     };
     TxBuilder.prototype.calcLinearFee = function (tx) {
         return ((0, ints_1.forceBigUInt)(this.protocolParamters.txFeePerByte) *
-            BigInt((tx instanceof cardano_ledger_ts_1.Tx ? tx.toCbor() : tx).toBuffer().length
+            BigInt((tx instanceof cardano_ledger_ts_1.Tx ? tx.toCbor() : tx).length
                 + 2 // for good measure
             ) +
             (0, ints_1.forceBigUInt)(this.protocolParamters.txFeeFixed));
@@ -179,7 +179,7 @@ var TxBuilder = /** @class */ (function () {
         var totRefScriptBytes = ((_a = tx.body.refInputs) !== null && _a !== void 0 ? _a : [])
             .reduce(function (sum, refIn) {
             if (refIn.resolved.refScript)
-                return sum + BigInt(refIn.resolved.refScript.toCbor().toBuffer().length
+                return sum + BigInt(refIn.resolved.refScript.toCbor().length
                     + 10 // second Cbor wrap
                 );
             return sum;
@@ -207,18 +207,10 @@ var TxBuilder = /** @class */ (function () {
     TxBuilder.prototype.getMinimumOutputLovelaces = function (tx_out) {
         var size = BigInt(0);
         if (tx_out instanceof cardano_ledger_ts_1.TxOut)
-            tx_out = tx_out.toCbor().toBuffer();
+            tx_out = tx_out.toCbor();
         if (typeof tx_out === "string")
             size = BigInt(Math.ceil(tx_out.length / 2));
-        else if (!(tx_out instanceof Uint8Array)) {
-            if ((0, obj_utils_1.isObject)(tx_out) &&
-                (0, obj_utils_1.hasOwn)(tx_out, "toBuffer") &&
-                typeof tx_out.toBuffer === "function")
-                tx_out = tx_out.toBuffer();
-            if (!(tx_out instanceof Uint8Array))
-                tx_out = (0, uint8array_utils_1.fromHex)(tx_out.toString());
-        }
-        if (tx_out instanceof Uint8Array)
+        else if (tx_out instanceof Uint8Array)
             size = BigInt(tx_out.length);
         // overestimating the size a bit
         return BigInt(this.protocolParamters.utxoCostPerByte) * (size + BigInt(10));
@@ -306,7 +298,7 @@ var TxBuilder = /** @class */ (function () {
         if (opts === void 0) { opts = { mustHaveV3: true }; }
         // datums passed by hash
         var datums = (_a = tx.witnesses.datums) !== null && _a !== void 0 ? _a : [];
-        return new cardano_ledger_ts_1.Tx(__assign(__assign({}, tx), { body: new cardano_ledger_ts_1.TxBody(__assign(__assign({}, tx.body), { scriptDataHash: getScriptDataHash(tx.witnesses, (0, cardano_costmodels_ts_1.costModelsToLanguageViewCbor)(this.protocolParamters.costModels, opts).toBuffer()) })), witnesses: new cardano_ledger_ts_1.TxWitnessSet(__assign(__assign({}, tx.witnesses), { vkeyWitnesses: [], redeemers: newRedeemers })) }));
+        return new cardano_ledger_ts_1.Tx(__assign(__assign({}, tx), { body: new cardano_ledger_ts_1.TxBody(__assign(__assign({}, tx.body), { scriptDataHash: getScriptDataHash(tx.witnesses, (0, cardano_costmodels_ts_1.costModelsToLanguageViewCbor)(this.protocolParamters.costModels, opts)) })), witnesses: new cardano_ledger_ts_1.TxWitnessSet(__assign(__assign({}, tx.witnesses), { vkeyWitnesses: [], redeemers: newRedeemers })) }));
     };
     TxBuilder.prototype.buildSync = function (buildArgs, _a) {
         var _b;
@@ -491,7 +483,7 @@ var TxBuilder = /** @class */ (function () {
             var onlyRedeemerArg = function (script) {
                 if (!(script instanceof cardano_ledger_ts_1.Script)) {
                     evalResults.push({
-                        result: new uplc_1.ErrorUPLC("missig script"),
+                        result: new plutus_machine_1.CEKError("missig script"),
                         budgetSpent: new plutus_machine_1.ExBudget({ mem: 0, cpu: 0 }),
                         logs: [],
                         rdmr: rdmr,
@@ -514,7 +506,7 @@ var TxBuilder = /** @class */ (function () {
                 var entry = (0, getScript_1.getSpendingScript)(tx, index);
                 if (!entry) {
                     evalResults.push({
-                        result: new uplc_1.ErrorUPLC("missig script"),
+                        result: new plutus_machine_1.CEKError("missig script"),
                         budgetSpent: new plutus_machine_1.ExBudget({ mem: 0, cpu: 0 }),
                         logs: [],
                         rdmr: rdmr,
@@ -588,7 +580,7 @@ var TxBuilder = /** @class */ (function () {
             var minLovelaces = this.getMinimumOutputLovelaces(out);
             if (out.value.lovelaces < minLovelaces)
                 throw new Error("tx output at index ".concat(i, " did not have enough lovelaces to meet the minimum allowed by protocol parameters.\n") +
-                    "output size: ".concat(out.toCbor().toBuffer().length, " bytes\n") +
+                    "output size: ".concat(out.toCbor().length, " bytes\n") +
                     "protocol paramters \"utxoCostPerByte\": ".concat(this.protocolParamters.utxoCostPerByte, "\n") +
                     "minimum lovelaces required: ".concat(minLovelaces.toString(), "\n") +
                     "output lovelaces          : ".concat(out.value.lovelaces.toString(), "\n") +
@@ -996,13 +988,13 @@ var TxBuilder = /** @class */ (function () {
             plutusV3Scripts: plutusV3ScriptsWitnesses
         });
         var datumsScriptData = datums.length > 0 ?
-            Array.from(cbor_1.Cbor.encode(new cbor_1.CborArray(datums.map(plutus_data_1.dataToCborObj))).toBuffer())
+            Array.from(cbor_1.Cbor.encode(new cbor_1.CborArray(datums.map(plutus_data_1.dataToCborObj))))
             : [];
         var languageViews = (0, cardano_costmodels_ts_1.costModelsToLanguageViewCbor)(this.protocolParamters.costModels, {
             mustHaveV1: _hasV1Scripts,
             mustHaveV2: _hasV2Scripts,
             mustHaveV3: _hasV3Scripts
-        }).toBuffer();
+        });
         invalidBefore = invalidBefore === undef ? undef : (0, ints_1.forceBigUInt)(invalidBefore);
         // if( invalidAfter !== undef )
         // {
@@ -1259,7 +1251,7 @@ function onEvaluationResult(i, totExBudget, rdmr, result, budgetSpent, logs, cal
         else {
             var callArgsStr = (callArgs
                 .map(function (d, i) {
-                return i.toString() + ": " + (0, plutus_data_1.dataToCbor)(d).toString();
+                return i.toString() + ": " + (0, uint8array_utils_1.toHex)((0, plutus_data_1.dataToCbor)(d));
             })
                 .join("\n"));
             var errorMsg = result === null || result === void 0 ? void 0 : result.msg;
@@ -1324,13 +1316,13 @@ function getScriptDataHash(witnesses, languageViews) {
         */
         scriptData = new Uint8Array(__spreadArray(__spreadArray([
             0xa0
-        ], __read(cbor_1.Cbor.encode(dats).toBuffer()), false), [
+        ], __read(cbor_1.Cbor.encode(dats)), false), [
             0xa0
         ], false));
     }
     else {
-        var rdmrsBuff = rdmrs ? cbor_1.Cbor.encode(rdmrs).toBuffer() : new Uint8Array([0x80]);
-        var datsBuff = dats ? cbor_1.Cbor.encode(dats).toBuffer() : new Uint8Array([]);
+        var rdmrsBuff = rdmrs ? cbor_1.Cbor.encode(rdmrs) : new Uint8Array([0x80]);
+        var datsBuff = dats ? cbor_1.Cbor.encode(dats) : new Uint8Array([]);
         scriptData = new Uint8Array(rdmrsBuff.length + datsBuff.length + languageViews.length);
         scriptData.set(rdmrsBuff, 0);
         scriptData.set(datsBuff, rdmrsBuff.length);

package/dist/TxBuilder/TxBuilderRunner/TxBuilderRunner.js

@@ -124,7 +124,7 @@ var _datumsHashes = [];
 var _MAX_DATUMS_CACHE_SIZE = 20;
 function _saveResolvedDatum(datum, hash) {
     var theData = (0, plutus_data_1.cloneData)(datum);
-    var actualHash = (0, uint8array_utils_1.toHex)(new Uint8Array((0, crypto_1.sha2_256_sync)((0, plutus_data_1.dataToCbor)(datum).toBuffer())));
+    var actualHash = (0, uint8array_utils_1.toHex)(new Uint8Array((0, crypto_1.sha2_256_sync)((0, plutus_data_1.dataToCbor)(datum))));
     var actualHashIdx = _datumsHashes.lastIndexOf(actualHash);
     if (actualHashIdx < 0) {
         _datumsHashes.push(actualHash);

package/dist/txBuild/ITxBuildInput/ITxBuildInput.js

@@ -44,7 +44,7 @@ function normalizeNativeScriptEntry(scr) {
     if (!scr)
         return undefined;
     if (isNativeScript(scr)) {
-        return new cardano_ledger_ts_1.Script("NativeScript", (0, cardano_ledger_ts_1.nativeScriptToCbor)(scr).toBuffer());
+        return new cardano_ledger_ts_1.Script("NativeScript", (0, cardano_ledger_ts_1.nativeScriptToCbor)(scr));
     }
     if (scr instanceof cardano_ledger_ts_1.Script && scr.type === cardano_ledger_ts_1.ScriptType.NativeScript)
         return scr.clone();

package/dist/txBuild/ITxBuildOptions.d.ts

@@ -1,7 +1,6 @@
 import { Tx, TxRedeemer } from "@harmoniclabs/cardano-ledger-ts";
 import { Data } from "@harmoniclabs/plutus-data";
-import { ExBudget } from "@harmoniclabs/plutus-machine";
-import { PureUPLCTerm } from "@harmoniclabs/uplc";
+import { ExBudget, CEKValueObj } from "@harmoniclabs/plutus-machine";
 export interface ITxBuildSyncOptions {
     /**
      * @default 1
@@ -9,7 +8,7 @@ export interface ITxBuildSyncOptions {
     **/
     nScriptExecitionRounds?: number;
     onScriptInvalid?: (rdmr: TxRedeemer, logs: string[], callArgs: Data[], tx: Tx) => void;
-    onScriptResult?: (rdmr: TxRedeemer, result: PureUPLCTerm, exBudget: ExBudget, logs: string[], callArgs: Data[], scriptHash: string, tx: Tx) => void;
+    onScriptResult?: (rdmr: TxRedeemer, result: CEKValueObj, exBudget: ExBudget, logs: string[], callArgs: Data[], scriptHash: string, tx: Tx) => void;
 }
 export interface ITxBuildOptions extends ITxBuildSyncOptions {
     keepWorkersAlive?: boolean;

package/dist/utils/CanBeData.js

@@ -9,8 +9,9 @@ var plutus_machine_1 = require("@harmoniclabs/plutus-machine");
 function cloneCanBeData(stuff) {
     if (typeof stuff === "string")
         return stuff;
-    if (stuff instanceof cbor_1.CborString ||
-        (0, cbor_1.isCborObj)(stuff) ||
+    if (stuff instanceof Uint8Array)
+        return Uint8Array.prototype.slice.call(stuff);
+    if ((0, cbor_1.isCborObj)(stuff) ||
         (0, plutus_data_1.isData)(stuff))
         return stuff.clone();
     var result = plutus_machine_1.Machine.evalSimple(stuff.toUPLC());
@@ -34,7 +35,7 @@ function canBeData(something) {
         (typeof something === "object" &&
             (0, obj_utils_1.hasOwn)(something, "toUPLC") &&
             typeof something.toUPLC === "function") ||
-        something instanceof cbor_1.CborString ||
+        something instanceof Uint8Array ||
         (0, cbor_1.isCborObj)(something));
 }
 exports.canBeData = canBeData;
@@ -57,7 +58,7 @@ function forceData(data) {
         }
         return _data;
     }
-    if (data instanceof cbor_1.CborString) {
+    if (data instanceof Uint8Array) {
         return (0, plutus_data_1.dataFromCbor)(data);
     }
     if ((0, cbor_1.isCborObj)(data)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@harmoniclabs/buildooor",
-    "version": "0.1.31",
+    "version": "0.2.1",
     "description": "Cardano transaction builder in typescript",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -47,16 +47,16 @@
         "@harmoniclabs/bigint-utils": "^1.0.0",
         "@harmoniclabs/bip32_ed25519": "^0.1.3",
         "@harmoniclabs/bytestring": "^1.0.0",
-        "@harmoniclabs/cardano-costmodels-ts": "^1.3.0",
-        "@harmoniclabs/cardano-ledger-ts": "^0.4.8",
-        "@harmoniclabs/cbor": "^1.6.6",
+        "@harmoniclabs/cardano-costmodels-ts": "^1.4.0",
+        "@harmoniclabs/cardano-ledger-ts": "^0.5.0",
+        "@harmoniclabs/cbor": "^2.0.1",
         "@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.3",
+        "@harmoniclabs/plutus-data": "^2.0.1",
+        "@harmoniclabs/plutus-machine": "^3.0.0",
         "@harmoniclabs/uint8array-utils": "^1.0.4",
-        "@harmoniclabs/uplc": "^1.4.1"
+        "@harmoniclabs/uplc": "^2.0.5"
     },
     "devDependencies": {
         "@babel/preset-env": "^7.18.6",
@@ -64,7 +64,7 @@
         "@types/jest": "^30.0.0",
         "@types/node": "^18.14.6",
         "jest": "^30.2.0",
-        "jest-environment-jsdom": "^29.4.3",
+        "jest-environment-jsdom": "^30.3.0",
         "tsc-alias": "^1.7.1",
         "typescript": "^4.6.3"
     },