@harmoniclabs/buildooor 0.1.5 → 0.1.7

package/dist/TxBuilder/utils/getScript.js

@@ -13,10 +13,19 @@ function getScriptByHash(tx, hash) {
     return ((_f = (_d = (_b = (_a = witnesses.plutusV1Scripts) === null || _a === void 0 ? void 0 : _a.find(function (s) { return (0, uint8array_utils_1.uint8ArrayEq)(hash, s.hash.toBuffer()); })) !== null && _b !== void 0 ? _b : (_c = witnesses.plutusV2Scripts) === null || _c === void 0 ? void 0 : _c.find(function (s) { return (0, uint8array_utils_1.uint8ArrayEq)(hash, s.hash.toBuffer()); })) !== null && _d !== void 0 ? _d : (_e = witnesses.plutusV3Scripts) === null || _e === void 0 ? void 0 : _e.find(function (s) { return (0, uint8array_utils_1.uint8ArrayEq)(hash, s.hash.toBuffer()); })) !== null && _f !== void 0 ? _f : (_h = (_g = tx.body.refInputs) === null || _g === void 0 ? void 0 : _g.find(function (i) { return i.resolved.refScript && (0, uint8array_utils_1.uint8ArrayEq)(hash, i.resolved.refScript.hash.toBuffer()); })) === null || _h === void 0 ? void 0 : _h.resolved.refScript);
 }
 function getSpendingScript(tx, index) {
-    var allScriptInputs = tx.body.inputs.filter(function (i) { return i.resolved.address.paymentCreds.type === cardano_ledger_ts_1.CredentialType.Script; });
-    if (allScriptInputs.length === 0)
+    if (tx.body.inputs.length <= index)
+        return undefined;
+    var sortedIns = tx.body.inputs.slice().sort(function (a, b) {
+        var ord = (0, uint8array_utils_1.lexCompare)(a.utxoRef.id.toBuffer(), b.utxoRef.id.toBuffer());
+        // if equal tx id order based on tx output index
+        if (ord === 0)
+            return a.utxoRef.index - b.utxoRef.index;
+        // else order by tx id
+        return ord;
+    });
+    var scriptInput = sortedIns[index];
+    if (!scriptInput)
         return undefined;
-    var scriptInput = allScriptInputs[index];
     var scriptHash = scriptInput.resolved.address.paymentCreds.hash.toBuffer();
     var script = getScriptByHash(tx, scriptHash);
     if (!script)

package/dist/txBuild/ITxBuildArgs.d.ts

@@ -8,6 +8,7 @@ import { CanBeUInteger } from "../utils/ints.js";
 import { ChangeInfos, NormalizedChangeInfos } from "./ChangeInfos/ChangeInfos.js";
 import { ITxBuildVotingProcedure, NormalizedITxBuildVotingProcedure } from "./ITxBuildVotingProcedure.js";
 import { ITxBuildProposalProcedure, NormalizedITxBuildProposalProcedure } from "./ITxBuildProposalProcedure.js";
+import { CanBeCborString } from "@harmoniclabs/cbor";
 export interface ITxBuildArgs {
     inputs: (ITxBuildInput | IUTxO)[];
     /**
@@ -19,7 +20,7 @@ export interface ITxBuildArgs {
      * });
      * ```
      */
-    changeAddress?: Address | AddressStr;
+    changeAddress?: Address | AddressStr | CanBeCborString;
     change?: ChangeInfos;
     outputs?: ITxBuildOutput[];
     readonlyRefInputs?: IUTxO[];
@@ -69,8 +70,8 @@ export interface NormalizedITxBuildArgs extends ITxBuildArgs {
     metadata?: TxMetadata;
     votingProcedures?: NormalizedITxBuildVotingProcedure[];
     proposalProcedures?: NormalizedITxBuildProposalProcedure[];
-    currentTreasuryValue?: bigint;
-    paymentToTreasury?: bigint;
+    currentTreasuryValue?: CanBeUInteger;
+    paymentToTreasury?: CanBeUInteger;
 }
 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 */

package/dist/txBuild/ITxBuildArgs.js

@@ -11,18 +11,17 @@ 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");
+var cbor_1 = require("@harmoniclabs/cbor");
 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, 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,
-        changeAddress: changeAddress ? (typeof changeAddress === "string" ?
-            cardano_ledger_ts_1.Address.fromString(changeAddress) :
-            changeAddress) : undefined,
-        outputs: outputs === null || outputs === void 0 ? void 0 : outputs.map(ITxBuildOutput_1.txBuildOutToTxOut),
-        readonlyRefInputs: readonlyRefInputs === null || readonlyRefInputs === void 0 ? void 0 : readonlyRefInputs.map(toUTxONoClone),
+        changeAddress: normalizeChangeAddress(changeAddress),
+        outputs: outputs === null || outputs === void 0 ? void 0 : outputs.map(normalizeTxBuildArgsOutputs),
+        readonlyRefInputs: readonlyRefInputs === null || readonlyRefInputs === void 0 ? void 0 : readonlyRefInputs.map(nomalizeUTXOInput),
         requiredSigners: requiredSigners === null || requiredSigners === void 0 ? void 0 : requiredSigners.map(toPubKeyHash),
-        collaterals: collaterals === null || collaterals === void 0 ? void 0 : collaterals.map(toUTxONoClone),
+        collaterals: collaterals === null || collaterals === void 0 ? void 0 : collaterals.map(nomalizeUTXOInput),
         collateralReturn: collateralReturn ? (0, ITxBuildOutput_1.txBuildOutToTxOut)(collateralReturn) : undefined,
         mints: mints === null || mints === void 0 ? void 0 : mints.map(ITxBuildMint_1.normalizeITxBuildMint),
         invalidBefore: invalidBefore === undefined ? undefined : BigInt(invalidBefore),
@@ -32,36 +31,78 @@ function normalizeITxBuildArgs(_a) {
         fee: (0, ints_1.canBeUInteger)(fee) ? BigInt(fee) : undefined,
         memo: memo ? String(memo) : undefined,
         metadata: metadata,
-        votingProcedures: Array.isArray(votingProcedures) ?
-            votingProcedures.map(function (entry) {
+        votingProcedures: Array.isArray(votingProcedures)
+            ? votingProcedures.map(function (entry) {
                 if ((0, cardano_ledger_ts_1.isIVotingProceduresEntry)(entry))
                     entry = {
                         votingProcedure: entry,
-                        script: undefined // for js shape optimization
+                        script: undefined, // for js shape optimization
                     };
                 return (0, ITxBuildVotingProcedure_1.normalizeITxBuildVotingProcedure)(entry);
-            }) : undefined,
-        proposalProcedures: Array.isArray(proposalProcedures) ?
-            proposalProcedures.map(function (entry) {
+            })
+            : undefined,
+        proposalProcedures: Array.isArray(proposalProcedures)
+            ? proposalProcedures.map(function (entry) {
                 if ((0, cardano_ledger_ts_1.isIProposalProcedure)(entry))
                     entry = {
                         proposalProcedure: entry,
-                        script: undefined
+                        script: undefined,
                     };
                 return (0, ITxBuildProposalProcedure_1.normalizeITxBuildProposalProcedure)(entry);
-            }) : undefined,
+            })
+            : undefined,
         currentTreasuryValue: currentTreasuryValue === undefined ? undefined : BigInt(currentTreasuryValue),
         paymentToTreasury: paymentToTreasury === undefined ? undefined : BigInt(paymentToTreasury),
     };
 }
 exports.normalizeITxBuildArgs = normalizeITxBuildArgs;
+/** Check input type and convert to NormalizedITxBuildInput */
 function normalizeITxBuildArgsInputs(input) {
-    if ((0, cardano_ledger_ts_1.isIUTxO)(input))
+    if ((0, cbor_1.canBeCborString)(input)) {
+        var cborData = (0, cbor_1.forceCborString)(input);
+        var iUtxo = cardano_ledger_ts_1.UTxO.fromCbor(cborData);
+        return (0, ITxBuildInput_1.normalizeITxBuildInput)({ utxo: iUtxo });
+    }
+    if ((0, cardano_ledger_ts_1.isIUTxO)(input)) {
         return { utxo: new cardano_ledger_ts_1.UTxO(input) };
+    }
     return (0, ITxBuildInput_1.normalizeITxBuildInput)(input);
 }
-function toUTxONoClone(utxo) {
-    return utxo instanceof cardano_ledger_ts_1.UTxO ? utxo : new cardano_ledger_ts_1.UTxO(utxo);
+/** Check Changeaddress type and convert to normalizeChangeAddress */
+function normalizeChangeAddress(changeAddress) {
+    if (changeAddress === undefined) {
+        return undefined;
+    }
+    if ((0, cardano_ledger_ts_1.isAddressStr)(changeAddress)) {
+        return cardano_ledger_ts_1.Address.fromString(changeAddress);
+    }
+    if ((0, cbor_1.canBeCborString)(changeAddress)) {
+        var cborData = (0, cbor_1.forceCborString)(changeAddress);
+        console.log("address cborData: ", cborData);
+        return cardano_ledger_ts_1.Address.fromCbor(cborData);
+    }
+    if (changeAddress instanceof cardano_ledger_ts_1.Address) {
+        return changeAddress;
+    }
+}
+/** Check output type and convert to TxOut */
+function normalizeTxBuildArgsOutputs(output) {
+    if ((0, cbor_1.canBeCborString)(output)) {
+        var cborData = (0, cbor_1.forceCborString)(output);
+        var txout = cardano_ledger_ts_1.TxOut.fromCbor(cborData);
+        return (0, ITxBuildOutput_1.txBuildOutToTxOut)(txout);
+    }
+    if ((0, cardano_ledger_ts_1.isITxOut)(output)) {
+        return (0, ITxBuildOutput_1.txBuildOutToTxOut)(output);
+    }
+    return (0, ITxBuildOutput_1.txBuildOutToTxOut)(output);
+}
+function nomalizeUTXOInput(input) {
+    if ((0, cbor_1.canBeCborString)(input)) {
+        var cborData = (0, cbor_1.forceCborString)(input);
+        return cardano_ledger_ts_1.UTxO.fromCbor(cborData);
+    }
+    return new cardano_ledger_ts_1.UTxO(input);
 }
 function toPubKeyHash(hash) {
     return new cardano_ledger_ts_1.PubKeyHash(hash);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@harmoniclabs/buildooor",
-    "version": "0.1.5",
+    "version": "0.1.7",
     "description": "Cardano transaction builder in typescript",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -52,7 +52,7 @@
         "@harmoniclabs/bytestring": "^1.0.0",
         "@harmoniclabs/cardano-costmodels-ts": "^1.3.0",
         "@harmoniclabs/cardano-ledger-ts": "^0.3.2",
-        "@harmoniclabs/cbor": "^1.6.0",
+        "@harmoniclabs/cbor": "^1.6.6",
         "@harmoniclabs/pair": "^1.0.0",
         "@harmoniclabs/plutus-data": "^1.2.6",
         "@harmoniclabs/plutus-machine": "^2.1.0",