@harmoniclabs/buildooor 0.1.2 → 0.1.4

package/dist/TxBuilder/TxBuilder.d.ts

@@ -1,7 +1,7 @@
 import { GenesisInfos, NormalizedGenesisInfos } from "./GenesisInfos.js";
 import { CostModelsToLanguageViewCborOpts } from "@harmoniclabs/cardano-costmodels-ts";
 import { Tx, Value, ValueUnits, TxOut, TxRedeemerTag, ScriptType, UTxO, TxRedeemer, TxWitnessSet, ScriptDataHash, ITxOut } from "@harmoniclabs/cardano-ledger-ts";
-import { CborString, CanBeCborString } from "@harmoniclabs/cbor";
+import { CanBeCborString } from "@harmoniclabs/cbor";
 import { Data } from "@harmoniclabs/plutus-data";
 import { ITxBuildArgs, ITxBuildOptions, ITxBuildInput, ITxBuildSyncOptions } from "../txBuild/index.js";
 import { CanBeUInteger } from "../utils/ints.js";
@@ -16,8 +16,8 @@ export declare class TxBuilder {
     runWithProvider(provider: Partial<ITxRunnerProvider>): TxBuilderRunner;
     constructor(protocolParamters?: Readonly<TxBuilderProtocolParams>, genesisInfos?: GenesisInfos);
     keepRelevant(requestedOutputSet: Value | ValueUnits, initialUTxOSet: ITxBuildInput[], minimumLovelaceRequired?: CanBeUInteger): ITxBuildInput[];
-    calcLinearFee(tx: Tx | CborString): bigint;
-    calcMinFee(tx: Tx): bigint;
+    private calcLinearFee;
+    calcMinFee(tx: Tx, minimum?: CanBeUInteger | undefined): bigint;
     getMinimumOutputLovelaces(tx_out: TxOut | CanBeCborString): bigint;
     addMinLovelacesIfMissing(txOut: TxOut): TxOut;
     minimizeLovelaces(out: ITxOut): TxOut;

package/dist/TxBuilder/TxBuilder.js

@@ -168,10 +168,12 @@ 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).toBuffer().length
+                + 2 // for good measure
+            ) +
             (0, ints_1.forceBigUInt)(this.protocolParamters.txFeeFixed));
     };
-    TxBuilder.prototype.calcMinFee = function (tx) {
+    TxBuilder.prototype.calcMinFee = function (tx, minimum) {
         var _a;
         var totRefScriptBytes = ((_a = tx.body.refInputs) !== null && _a !== void 0 ? _a : [])
             .reduce(function (sum, refIn) {
@@ -192,10 +194,14 @@ var TxBuilder = /** @class */ (function () {
             // each vkey witness has fixed size of 102 cbor bytes
             // (1 bytes cbor array tag (length 2)) + (34 cbor bytes of length 32) + (67 cbor bytes of length 64)
             // for a fixed length of 102
-            BigInt(102) * nVkeyWits * minFeeMultiplier +
+            // we also add 2 for possible unwanted encoding
+            BigInt(104) * nVkeyWits * minFeeMultiplier +
             // we add some more bytes for the array tag
-            BigInt(nVkeyWits < 24 ? 1 : (nVkeyWits < 256 ? 2 : 3)) * minFeeMultiplier;
-        return minFee;
+            BigInt(nVkeyWits < 24 ? 1 : (nVkeyWits < 256 ? 2 : 4)) * minFeeMultiplier;
+        if (!(0, ints_1.canBeUInteger)(minimum))
+            return minFee;
+        var min = (0, ints_1.forceBigUInt)(minimum);
+        return minFee < min ? min : minFee;
     };
     TxBuilder.prototype.getMinimumOutputLovelaces = function (tx_out) {
         var size = BigInt(0);
@@ -407,7 +413,7 @@ var TxBuilder = /** @class */ (function () {
             for (var i = 0; i < nRdmrs; i++) {
                 _loop_2(i);
             }
-            minFee = this_1.calcMinFee(tx);
+            minFee = this_1.calcMinFee(tx, buildArgs.fee);
             fee = minFee +
                 ((totExBudget.mem * memRational.num) / memRational.den) +
                 ((totExBudget.cpu * cpuRational.num) / cpuRational.den) +
@@ -942,7 +948,7 @@ var TxBuilder = /** @class */ (function () {
             auxiliaryData: auxData,
             isScriptValid: isScriptValid
         });
-        var minFee = this.calcMinFee(dummyTx);
+        var minFee = this.calcMinFee(dummyTx, args.fee);
         var txOuts = new Array(outs.length + 1);
         outs.forEach(function (txO, i) { return txOuts[i] = _this.addMinLovelacesIfMissing(txO); });
         var changeOutput = new cardano_ledger_ts_1.TxOut({

package/dist/txBuild/ITxBuildArgs.d.ts

@@ -31,6 +31,8 @@ export interface ITxBuildArgs {
     invalidAfter?: CanBeUInteger;
     certificates?: ITxBuildCert[];
     withdrawals?: ITxBuildWithdrawal[];
+    /** explicitly sets the fee (if higher than calculated minFee) */
+    fee?: CanBeUInteger;
     /**
      * # metadata message following cip20
      *
@@ -57,6 +59,7 @@ export interface NormalizedITxBuildArgs extends ITxBuildArgs {
     invalidAfter?: CanBeUInteger;
     certificates?: NormalizedITxBuildCert[];
     withdrawals?: NormalizedITxBuildWithdrawal[];
+    fee?: bigint;
     /**
      * # metadata message following cip20
      *
@@ -69,6 +72,6 @@ export interface NormalizedITxBuildArgs extends ITxBuildArgs {
     currentTreasuryValue?: bigint;
     paymentToTreasury?: bigint;
 }
-export declare function normalizeITxBuildArgs({ inputs, change, changeAddress, outputs, readonlyRefInputs, requiredSigners, collaterals, collateralReturn, mints, invalidBefore, invalidAfter, certificates, withdrawals, memo, metadata, votingProcedures, proposalProcedures, currentTreasuryValue, paymentToTreasury }: ITxBuildArgs): NormalizedITxBuildArgs;
+export declare function normalizeITxBuildArgs({ inputs, change, changeAddress, outputs, readonlyRefInputs, requiredSigners, collaterals, collateralReturn, mints, invalidBefore, invalidAfter, certificates, withdrawals, fee, memo, metadata, votingProcedures, proposalProcedures, currentTreasuryValue, paymentToTreasury }: ITxBuildArgs): NormalizedITxBuildArgs;
 /** @deprecated use `normalizeITxBuildArgs` instead */
 export declare function cloneITxBuildArgs(args: ITxBuildArgs): ITxBuildArgs;

package/dist/txBuild/ITxBuildArgs.js

@@ -7,11 +7,12 @@ var ITxBuildInput_1 = require("./ITxBuildInput/ITxBuildInput.js");
 var ITxBuildMint_1 = require("./ITxBuildMint.js");
 var ITxBuildOutput_1 = require("./ITxBuildOutput.js");
 var ITxBuildWithdrawal_1 = require("./ITxBuildWithdrawal.js");
+var ints_1 = require("../utils/ints.js");
 var ChangeInfos_1 = require("./ChangeInfos/ChangeInfos.js");
 var ITxBuildVotingProcedure_1 = require("./ITxBuildVotingProcedure.js");
 var ITxBuildProposalProcedure_1 = require("./ITxBuildProposalProcedure.js");
 function normalizeITxBuildArgs(_a) {
-    var inputs = _a.inputs, change = _a.change, changeAddress = _a.changeAddress, outputs = _a.outputs, readonlyRefInputs = _a.readonlyRefInputs, requiredSigners = _a.requiredSigners, collaterals = _a.collaterals, collateralReturn = _a.collateralReturn, mints = _a.mints, invalidBefore = _a.invalidBefore, invalidAfter = _a.invalidAfter, certificates = _a.certificates, withdrawals = _a.withdrawals, memo = _a.memo, metadata = _a.metadata, votingProcedures = _a.votingProcedures, proposalProcedures = _a.proposalProcedures, currentTreasuryValue = _a.currentTreasuryValue, paymentToTreasury = _a.paymentToTreasury;
+    var inputs = _a.inputs, change = _a.change, changeAddress = _a.changeAddress, outputs = _a.outputs, readonlyRefInputs = _a.readonlyRefInputs, requiredSigners = _a.requiredSigners, collaterals = _a.collaterals, collateralReturn = _a.collateralReturn, mints = _a.mints, invalidBefore = _a.invalidBefore, invalidAfter = _a.invalidAfter, certificates = _a.certificates, withdrawals = _a.withdrawals, fee = _a.fee, memo = _a.memo, metadata = _a.metadata, votingProcedures = _a.votingProcedures, proposalProcedures = _a.proposalProcedures, currentTreasuryValue = _a.currentTreasuryValue, paymentToTreasury = _a.paymentToTreasury;
     return {
         inputs: inputs.map(normalizeITxBuildArgsInputs),
         change: change ? (0, ChangeInfos_1.normalizeChangeInfos)(change) : undefined,
@@ -28,6 +29,7 @@ function normalizeITxBuildArgs(_a) {
         invalidAfter: invalidAfter === undefined ? undefined : BigInt(invalidAfter),
         certificates: certificates === null || certificates === void 0 ? void 0 : certificates.map(ITxBuildCert_1.normalizeITxBuildCert),
         withdrawals: withdrawals === null || withdrawals === void 0 ? void 0 : withdrawals.map(ITxBuildWithdrawal_1.normalizeITxBuildWithdrawal),
+        fee: (0, ints_1.canBeUInteger)(fee) ? BigInt(fee) : undefined,
         memo: memo ? String(memo) : undefined,
         metadata: metadata,
         votingProcedures: Array.isArray(votingProcedures) ?

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@harmoniclabs/buildooor",
-    "version": "0.1.2",
+    "version": "0.1.4",
     "description": "Cardano transaction builder in typescript",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",