@indigo-labs/indigo-sdk 0.2.34 → 0.2.36

package/dist/index.mjs

@@ -34,6 +34,33 @@ import {
   scriptHashToCredential,
   stakeCredentialOf
 } from "@lucid-evolution/lucid";
+
+// src/utils/utils.ts
+import * as fs from "fs";
+import { match, P } from "ts-pattern";
+function matchSingle(xs, mkErr) {
+  return match(xs).with([P.select()], (res) => res).otherwise(() => {
+    throw mkErr(xs);
+  });
+}
+function loadSystemParamsFromFile(file) {
+  return JSON.parse(fs.readFileSync(file, "utf-8"));
+}
+function loadSystemParamsFromUrl(url) {
+  return fetch(url).then((res) => res.json()).then((data) => data);
+}
+var getRandomElement = (arr) => arr.length ? arr[Math.floor(Math.random() * arr.length)] : void 0;
+
+// src/utils/lucid-utils.ts
+async function resolveUtxo(input, lucid, errorMsg = "Expected a single UTXO") {
+  if ("address" in input) {
+    return input;
+  }
+  return matchSingle(
+    await lucid.utxosByOutRef([input]),
+    (_) => new Error(errorMsg)
+  );
+}
 function getInlineDatumOrThrow(utxo) {
   if (utxo.datum != null) {
     return utxo.datum;
@@ -72,22 +99,6 @@ function balance(utxos) {
   return utxos.reduce((acc, utxo) => addAssets(acc, utxo.assets), {});
 }
 
-// src/utils/utils.ts
-import * as fs from "fs";
-import { match, P } from "ts-pattern";
-function matchSingle(xs, mkErr) {
-  return match(xs).with([P.select()], (res) => res).otherwise(() => {
-    throw mkErr(xs);
-  });
-}
-function loadSystemParamsFromFile(file) {
-  return JSON.parse(fs.readFileSync(file, "utf-8"));
-}
-function loadSystemParamsFromUrl(url) {
-  return fetch(url).then((res) => res.json()).then((data) => data);
-}
-var getRandomElement = (arr) => arr.length ? arr[Math.floor(Math.random() * arr.length)] : void 0;
-
 // src/contracts/cdp/types.ts
 import { Data as Data4 } from "@lucid-evolution/lucid";
 
@@ -1191,9 +1202,7 @@ function liquidationHelper(spContent, iassetBurnAmt, reward) {
 import { array as A2, function as F3 } from "fp-ts";
 
 // src/contracts/collector/transactions.ts
-import {
-  Data as Data10
-} from "@lucid-evolution/lucid";
+import { Data as Data10 } from "@lucid-evolution/lucid";
 
 // src/contracts/collector/types.ts
 import { Data as Data9 } from "@lucid-evolution/lucid";
@@ -1208,10 +1217,11 @@ function serialiseCollectorRedeemer(redeemer) {
 }
 
 // src/contracts/collector/transactions.ts
-async function collectorFeeTx(fee, lucid, params, tx, collectorOref) {
-  const collectorUtxo = matchSingle(
-    await lucid.utxosByOutRef([collectorOref]),
-    (_) => new Error("Expected a single collector UTXO")
+async function collectorFeeTx(fee, lucid, params, tx, collector) {
+  const collectorUtxo = await resolveUtxo(
+    collector,
+    lucid,
+    "Expected a single collector UTXO"
   );
   const collectorRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -1264,11 +1274,12 @@ function serialiseTreasuryRedeemer(redeemer) {
 }
 
 // src/contracts/treasury/transactions.ts
-async function treasuryFeeTx(fee, lucid, sysParams, tx, treasuryOref) {
+async function treasuryFeeTx(fee, lucid, sysParams, tx, treasury) {
   if (fee <= 0n) return;
-  const treasuryUtxo = matchSingle(
-    await lucid.utxosByOutRef([treasuryOref]),
-    (_) => new Error("Expected a single treasury UTXO")
+  const treasuryUtxo = await resolveUtxo(
+    treasury,
+    lucid,
+    "Expected a single treasury UTXO"
   );
   const treasuryRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -1293,7 +1304,7 @@ async function treasuryFeeTx(fee, lucid, sysParams, tx, treasuryOref) {
 }
 
 // src/contracts/cdp/transactions.ts
-async function openCdp(collateralAmount, mintedAmount, sysParams, cdpCreatorOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, lucid, currentSlot) {
+async function openCdp(collateralAmount, mintedAmount, sysParams, cdpCreator, iasset, priceOracle, interestOracle, collector, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime3(network, currentSlot));
   const [pkh, skh] = await addrDetails(lucid);
@@ -1321,30 +1332,34 @@ async function openCdp(collateralAmount, mintedAmount, sysParams, cdpCreatorOref
     ]),
     (_) => new Error("Expected a single iasset token policy Ref Script UTXO")
   );
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOref]),
-    (_) => new Error("Expected a single iasset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single iasset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
   );
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOref]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
   const priceOracleDatum = parsePriceOracleDatum(
     getInlineDatumOrThrow(priceOracleUtxo)
   );
-  const interestOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([interestOracleOref]),
-    (_) => new Error("Expected a single interest oracle UTXO")
+  const interestOracleUtxo = await resolveUtxo(
+    interestOracle,
+    lucid,
+    "Expected a single interest oracle UTXO"
   );
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
   );
-  const cdpCreatorUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpCreatorOref]),
-    (_) => new Error("Expected a single CDP creator UTXO")
+  const cdpCreatorUtxo = await resolveUtxo(
+    cdpCreator,
+    lucid,
+    "Expected a single CDP creator UTXO"
   );
   match7(iassetDatum.price).with({ Delisted: P6.any }, () => {
     throw new Error("Can't open CDP of delisted asset");
@@ -1411,11 +1426,11 @@ async function openCdp(collateralAmount, mintedAmount, sysParams, cdpCreatorOref
     mintedAmount * priceOracleDatum.price.getOnChainInt / 1000000n
   );
   if (debtMintingFee > 0) {
-    await collectorFeeTx(debtMintingFee, lucid, sysParams, tx, collectorOref);
+    await collectorFeeTx(debtMintingFee, lucid, sysParams, tx, collector);
   }
   return tx;
 }
-async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, govOref, treasuryOref, sysParams, lucid, currentSlot) {
+async function adjustCdp(collateralAmount, mintAmount, cdp, iasset, priceOracle, interestOracle, collector, gov, treasury, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime3(network, currentSlot));
   const cdpRefScriptUtxo = matchSingle(
@@ -1424,33 +1439,30 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
     ]),
     (_) => new Error("Expected a single cdp Ref Script UTXO")
   );
-  const cdpUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpOref]),
-    (_) => new Error("Expected a single cdp UTXO")
-  );
+  const cdpUtxo = await resolveUtxo(cdp, lucid, "Expected a single cdp UTXO");
   const cdpDatum = parseCdpDatumOrThrow(getInlineDatumOrThrow(cdpUtxo));
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOref]),
-    (_) => new Error("Expected a single iasset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single iasset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
   );
-  const govUtxo = matchSingle(
-    await lucid.utxosByOutRef([govOref]),
-    (_) => new Error("Expected a single gov UTXO")
-  );
+  const govUtxo = await resolveUtxo(gov, lucid, "Expected a single gov UTXO");
   const govDatum = parseGovDatumOrThrow(getInlineDatumOrThrow(govUtxo));
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOref]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
   const priceOracleDatum = parsePriceOracleDatum(
     getInlineDatumOrThrow(priceOracleUtxo)
   );
-  const interestOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([interestOracleOref]),
-    (_) => new Error("Expected a single interest oracle UTXO")
+  const interestOracleUtxo = await resolveUtxo(
+    interestOracle,
+    lucid,
+    "Expected a single interest oracle UTXO"
   );
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
@@ -1538,13 +1550,7 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
   );
   const interestTreasuryAdaAmt = interestAdaAmt - interestCollectorAdaAmt;
   if (interestTreasuryAdaAmt > 0) {
-    await treasuryFeeTx(
-      interestTreasuryAdaAmt,
-      lucid,
-      sysParams,
-      tx,
-      treasuryOref
-    );
+    await treasuryFeeTx(interestTreasuryAdaAmt, lucid, sysParams, tx, treasury);
   }
   let collectorFee = interestCollectorAdaAmt;
   if (mintAmount > 0n) {
@@ -1560,75 +1566,75 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
     );
   }
   if (collectorFee > 0n) {
-    await collectorFeeTx(collectorFee, lucid, sysParams, tx, collectorOref);
+    await collectorFeeTx(collectorFee, lucid, sysParams, tx, collector);
   }
   return tx;
 }
-async function depositCdp(amount, cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, govOref, treasuryOref, params, lucid, currentSlot) {
+async function depositCdp(amount, cdp, iasset, priceOracle, interestOracle, collector, gov, treasury, params, lucid, currentSlot) {
   return adjustCdp(
     amount,
     0n,
-    cdpOref,
-    iassetOref,
-    priceOracleOref,
-    interestOracleOref,
-    collectorOref,
-    govOref,
-    treasuryOref,
+    cdp,
+    iasset,
+    priceOracle,
+    interestOracle,
+    collector,
+    gov,
+    treasury,
     params,
     lucid,
     currentSlot
   );
 }
-async function withdrawCdp(amount, cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, govOref, treasuryOref, params, lucid, currentSlot) {
+async function withdrawCdp(amount, cdp, iasset, priceOracle, interestOracle, collector, gov, treasury, params, lucid, currentSlot) {
   return adjustCdp(
     -amount,
     0n,
-    cdpOref,
-    iassetOref,
-    priceOracleOref,
-    interestOracleOref,
-    collectorOref,
-    govOref,
-    treasuryOref,
+    cdp,
+    iasset,
+    priceOracle,
+    interestOracle,
+    collector,
+    gov,
+    treasury,
     params,
     lucid,
     currentSlot
   );
 }
-async function mintCdp(amount, cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, govOref, treasuryOref, params, lucid, currentSlot) {
+async function mintCdp(amount, cdp, iasset, priceOracle, interestOracle, collector, gov, treasury, params, lucid, currentSlot) {
   return adjustCdp(
     0n,
     amount,
-    cdpOref,
-    iassetOref,
-    priceOracleOref,
-    interestOracleOref,
-    collectorOref,
-    govOref,
-    treasuryOref,
+    cdp,
+    iasset,
+    priceOracle,
+    interestOracle,
+    collector,
+    gov,
+    treasury,
     params,
     lucid,
     currentSlot
   );
 }
-async function burnCdp(amount, cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, govOref, treasuryOref, params, lucid, currentSlot) {
+async function burnCdp(amount, cdp, iasset, priceOracle, interestOracle, collector, gov, treasury, params, lucid, currentSlot) {
   return adjustCdp(
     0n,
     -amount,
-    cdpOref,
-    iassetOref,
-    priceOracleOref,
-    interestOracleOref,
-    collectorOref,
-    govOref,
-    treasuryOref,
+    cdp,
+    iasset,
+    priceOracle,
+    interestOracle,
+    collector,
+    gov,
+    treasury,
     params,
     lucid,
     currentSlot
   );
 }
-async function closeCdp(cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, govOref, treasuryOref, sysParams, lucid, currentSlot) {
+async function closeCdp(cdp, iasset, priceOracle, interestOracle, collector, gov, treasury, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime3(network, currentSlot));
   const cdpRefScriptUtxo = matchSingle(
@@ -1653,33 +1659,30 @@ async function closeCdp(cdpOref, iassetOref, priceOracleOref, interestOracleOref
     ]),
     (_) => new Error("Expected a single iasset token policy Ref Script UTXO")
   );
-  const cdpUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpOref]),
-    (_) => new Error("Expected a single cdp UTXO")
-  );
+  const cdpUtxo = await resolveUtxo(cdp, lucid, "Expected a single cdp UTXO");
   const cdpDatum = parseCdpDatumOrThrow(getInlineDatumOrThrow(cdpUtxo));
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOref]),
-    (_) => new Error("Expected a single iasset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single iasset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
   );
-  const govUtxo = matchSingle(
-    await lucid.utxosByOutRef([govOref]),
-    (_) => new Error("Expected a single gov UTXO")
-  );
+  const govUtxo = await resolveUtxo(gov, lucid, "Expected a single gov UTXO");
   const govDatum = parseGovDatumOrThrow(getInlineDatumOrThrow(govUtxo));
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOref]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
   const priceOracleDatum = parsePriceOracleDatum(
     getInlineDatumOrThrow(priceOracleUtxo)
   );
-  const interestOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([interestOracleOref]),
-    (_) => new Error("Expected a single interest oracle UTXO")
+  const interestOracleUtxo = await resolveUtxo(
+    interestOracle,
+    lucid,
+    "Expected a single interest oracle UTXO"
   );
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
@@ -1732,24 +1735,18 @@ async function closeCdp(cdpOref, iassetOref, priceOracleOref, interestOracleOref
   );
   const interestTreasuryAdaAmt = interestAdaAmt - interestCollectorAdaAmt;
   if (interestTreasuryAdaAmt > 0) {
-    await treasuryFeeTx(
-      interestTreasuryAdaAmt,
-      lucid,
-      sysParams,
-      tx,
-      treasuryOref
-    );
+    await treasuryFeeTx(interestTreasuryAdaAmt, lucid, sysParams, tx, treasury);
   }
   const collectorFee = interestCollectorAdaAmt + calculateFeeFromPercentage(
     govDatum.protocolParams.collateralFeePercentage,
     lovelacesAmt(cdpUtxo.assets) - interestAdaAmt
   );
   if (collectorFee > 0n) {
-    await collectorFeeTx(collectorFee, lucid, sysParams, tx, collectorOref);
+    await collectorFeeTx(collectorFee, lucid, sysParams, tx, collector);
   }
   return tx;
 }
-async function redeemCdp(attemptedRedemptionIAssetAmt, cdpOref, iassetOref, priceOracleOref, interestOracleOref, collectorOref, treasuryOref, sysParams, lucid, currentSlot) {
+async function redeemCdp(attemptedRedemptionIAssetAmt, cdp, iasset, priceOracle, interestOracle, collector, treasury, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime3(network, currentSlot));
   const cdpRefScriptUtxo = matchSingle(
@@ -1766,28 +1763,28 @@ async function redeemCdp(attemptedRedemptionIAssetAmt, cdpOref, iassetOref, pric
     ]),
     (_) => new Error("Expected a single iasset token policy Ref Script UTXO")
   );
-  const cdpUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpOref]),
-    (_) => new Error("Expected a single cdp UTXO")
-  );
+  const cdpUtxo = await resolveUtxo(cdp, lucid, "Expected a single cdp UTXO");
   const cdpDatum = parseCdpDatumOrThrow(getInlineDatumOrThrow(cdpUtxo));
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOref]),
-    (_) => new Error("Expected a single iasset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single iasset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
   );
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOref]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
   const priceOracleDatum = parsePriceOracleDatum(
     getInlineDatumOrThrow(priceOracleUtxo)
   );
-  const interestOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([interestOracleOref]),
-    (_) => new Error("Expected a single interest oracle UTXO")
+  const interestOracleUtxo = await resolveUtxo(
+    interestOracle,
+    lucid,
+    "Expected a single interest oracle UTXO"
   );
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
@@ -1891,18 +1888,12 @@ async function redeemCdp(attemptedRedemptionIAssetAmt, cdpOref, iassetOref, pric
     lucid,
     sysParams,
     tx,
-    collectorOref
-  );
-  await treasuryFeeTx(
-    interestTreasuryAdaAmt,
-    lucid,
-    sysParams,
-    tx,
-    treasuryOref
+    collector
   );
+  await treasuryFeeTx(interestTreasuryAdaAmt, lucid, sysParams, tx, treasury);
   return tx;
 }
-async function freezeCdp(cdpOref, iassetOref, priceOracleOref, interestOracleOref, sysParams, lucid, currentSlot) {
+async function freezeCdp(cdp, iasset, priceOracle, interestOracle, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime3(network, currentSlot));
   const cdpRefScriptUtxo = matchSingle(
@@ -1911,28 +1902,28 @@ async function freezeCdp(cdpOref, iassetOref, priceOracleOref, interestOracleOre
     ]),
     (_) => new Error("Expected a single cdp Ref Script UTXO")
   );
-  const cdpUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpOref]),
-    (_) => new Error("Expected a single cdp UTXO")
-  );
+  const cdpUtxo = await resolveUtxo(cdp, lucid, "Expected a single cdp UTXO");
   const cdpDatum = parseCdpDatumOrThrow(getInlineDatumOrThrow(cdpUtxo));
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOref]),
-    (_) => new Error("Expected a single iasset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single iasset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
   );
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOref]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
   const priceOracleDatum = parsePriceOracleDatum(
     getInlineDatumOrThrow(priceOracleUtxo)
   );
-  const interestOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([interestOracleOref]),
-    (_) => new Error("Expected a single interest oracle UTXO")
+  const interestOracleUtxo = await resolveUtxo(
+    interestOracle,
+    lucid,
+    "Expected a single interest oracle UTXO"
   );
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
@@ -2007,7 +1998,7 @@ async function freezeCdp(cdpOref, iassetOref, priceOracleOref, interestOracleOre
     cdpUtxo.assets
   );
 }
-async function liquidateCdp(cdpOref, stabilityPoolOref, collectorOref, treasuryOref, sysParams, lucid) {
+async function liquidateCdp(cdp, stabilityPool, collector, treasury, sysParams, lucid) {
   const cdpRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(sysParams.scriptReferences.cdpValidatorRef)
@@ -2038,14 +2029,12 @@ async function liquidateCdp(cdpOref, stabilityPoolOref, collectorOref, treasuryO
     ]),
     (_) => new Error("Expected a single cdp auth token policy Ref Script UTXO")
   );
-  const cdpUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpOref]),
-    (_) => new Error("Expected a single cdp UTXO")
-  );
+  const cdpUtxo = await resolveUtxo(cdp, lucid, "Expected a single cdp UTXO");
   const cdpDatum = parseCdpDatumOrThrow(getInlineDatumOrThrow(cdpUtxo));
-  const spUtxo = matchSingle(
-    await lucid.utxosByOutRef([stabilityPoolOref]),
-    (_) => new Error("Expected a single stability pool UTXO")
+  const spUtxo = await resolveUtxo(
+    stabilityPool,
+    lucid,
+    "Expected a single stability pool UTXO"
   );
   const spDatum = parseStabilityPoolDatum(getInlineDatumOrThrow(spUtxo));
   const [lovelacesForTreasury, lovelacesForCollector] = match7(cdpDatum.cdpFees).returnType().with({ FrozenCDPAccumulatedFees: P6.select() }, (fees) => [
@@ -2115,14 +2104,8 @@ async function liquidateCdp(cdpOref, stabilityPoolOref, collectorOref, treasuryO
       Data13.void()
     );
   }
-  await collectorFeeTx(
-    lovelacesForCollector,
-    lucid,
-    sysParams,
-    tx,
-    collectorOref
-  );
-  await treasuryFeeTx(lovelacesForTreasury, lucid, sysParams, tx, treasuryOref);
+  await collectorFeeTx(lovelacesForCollector, lucid, sysParams, tx, collector);
+  await treasuryFeeTx(lovelacesForTreasury, lucid, sysParams, tx, treasury);
   return tx;
 }
 async function mergeCdps(cdpsToMergeUtxos, sysParams, lucid) {
@@ -2586,10 +2569,7 @@ function serialiseStakingDatum(d) {
 }
 
 // src/contracts/staking/helpers.ts
-import {
-  fromText as fromText3,
-  validatorToScriptHash
-} from "@lucid-evolution/lucid";
+import { fromText as fromText3, validatorToScriptHash } from "@lucid-evolution/lucid";
 
 // src/contracts/staking/scripts.ts
 import {
@@ -2643,20 +2623,17 @@ function updateStakingLockedAmount(stakingPosLockedAmt, currentTime) {
     stakingPosLockedAmt.entries().filter(([_, { votingEnd }]) => votingEnd > currentTime)
   );
 }
-function findStakingManagerByOutRef(stakingManagerRef, lucid) {
-  return lucid.utxosByOutRef([stakingManagerRef]).then(
-    (utxos) => utxos.map((utxo) => {
-      if (!utxo.datum) return void 0;
-      const datum = parseStakingManagerDatum(utxo.datum);
-      return { utxo, datum };
-    }).find((utxo) => utxo !== void 0)
-  ).then((result) => {
-    if (!result)
-      throw new Error(
-        "Unable to locate Staking Manager by output reference."
-      );
-    return result;
-  });
+async function findStakingManagerByOutRef(stakingManager, lucid) {
+  const utxo = await resolveUtxo(
+    stakingManager,
+    lucid,
+    "Unable to locate Staking Manager by output reference."
+  );
+  if (!utxo.datum) {
+    throw new Error("Staking Manager UTxO has no datum.");
+  }
+  const datum = parseStakingManagerDatum(utxo.datum);
+  return { utxo, datum };
 }
 function findStakingManager(params, lucid) {
   return lucid.utxosAtWithUnit(
@@ -2679,20 +2656,17 @@ function findStakingManager(params, lucid) {
     return result;
   });
 }
-function findStakingPositionByOutRef(stakingPositionRef, lucid) {
-  return lucid.utxosByOutRef([stakingPositionRef]).then(
-    (utxos) => utxos.map((utxo) => {
-      if (!utxo.datum) return void 0;
-      const datum = parseStakingPositionOrThrow(utxo.datum);
-      return { utxo, datum };
-    }).find((utxo) => utxo !== void 0)
-  ).then((result) => {
-    if (!result)
-      throw new Error(
-        "Unable to locate Staking Position by output reference."
-      );
-    return result;
-  });
+async function findStakingPositionByOutRef(stakingPosition, lucid) {
+  const utxo = await resolveUtxo(
+    stakingPosition,
+    lucid,
+    "Unable to locate Staking Position by output reference."
+  );
+  if (!utxo.datum) {
+    throw new Error("Staking Position UTxO has no datum.");
+  }
+  const datum = parseStakingPositionOrThrow(utxo.datum);
+  return { utxo, datum };
 }
 var rewardSnapshotPrecision = OCD_DECIMAL_UNIT * OCD_DECIMAL_UNIT;
 function distributeReward(snapshotAda, adaReward, totalStake) {
@@ -2804,89 +2778,38 @@ var teamVestingSchedule = [
   }
 ];
 var spDistributionSchedule = {
-  maxUnlockable: 14000000n * OCD_DECIMAL_UNIT,
+  maxUnlockable: 2013760n * OCD_DECIMAL_UNIT,
   schedule: [
     {
       vestedAtTime: 1669931100000n,
       unlockAmt: 28768n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1701467100000n,
-      unlockAmt: 33562n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1727387100000n,
-      unlockAmt: 33561n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1733003100000n,
-      unlockAmt: 38356n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1764539100000n,
-      unlockAmt: 43150n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1796075100000n,
-      unlockAmt: 47945n * OCD_DECIMAL_UNIT
     }
   ]
 };
 var liqDistributionSchedule = {
-  maxUnlockable: 5250000n * OCD_DECIMAL_UNIT,
+  maxUnlockable: 316470n * OCD_DECIMAL_UNIT,
   schedule: [
     {
       vestedAtTime: 1671659100000n,
       unlockAmt: 4795n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1703195100000n,
-      unlockAmt: 9590n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1728683100000n,
-      unlockAmt: 9589n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1734731100000n,
-      unlockAmt: 14383n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1766267100000n,
-      unlockAmt: 19178n * OCD_DECIMAL_UNIT
-    },
+    }
+  ]
+};
+var spLpDistributionSchedule = {
+  maxUnlockable: 17016441n * OCD_DECIMAL_UNIT,
+  schedule: [
     {
-      vestedAtTime: 1797803100000n,
-      unlockAmt: 23972n * OCD_DECIMAL_UNIT
+      vestedAtTime: 1700171100000n,
+      unlockAmt: 33563n * OCD_DECIMAL_UNIT
     }
   ]
 };
 var govDistributionSchedule = {
-  maxUnlockable: 1750000n * OCD_DECIMAL_UNIT,
+  maxUnlockable: 1381248n * OCD_DECIMAL_UNIT,
   schedule: [
     {
       vestedAtTime: 1670363100000n,
       unlockAmt: 2398n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1701899100000n,
-      unlockAmt: 3596n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1733435100000n,
-      unlockAmt: 4795n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1752443100000n,
-      unlockAmt: 4794n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1764971100000n,
-      unlockAmt: 5993n * OCD_DECIMAL_UNIT
-    },
-    {
-      vestedAtTime: 1796507100000n,
-      unlockAmt: 7191n * OCD_DECIMAL_UNIT
     }
   ]
 };
@@ -2919,7 +2842,7 @@ function calculateVestedPerEpoch(schedule, currentTime) {
   return bigintMin(schedule.maxUnlockable, go(schedule.schedule));
 }
 function calculateTotalVestedRewards(currentTime) {
-  return calculateVestedPerEpoch(spDistributionSchedule, currentTime) + calculateVestedPerEpoch(govDistributionSchedule, currentTime) + calculateVestedPerEpoch(liqDistributionSchedule, currentTime);
+  return calculateVestedPerEpoch(spDistributionSchedule, currentTime) + calculateVestedPerEpoch(govDistributionSchedule, currentTime) + calculateVestedPerEpoch(liqDistributionSchedule, currentTime) + calculateVestedPerEpoch(spLpDistributionSchedule, currentTime);
 }
 
 // src/contracts/poll/helpers.ts
@@ -2941,7 +2864,7 @@ function q(initialIndyDist, pollStatus, currentTime, treasuryIndyWithdrawnAmt) {
         )
       }
     ).getOnChainInt;
-    return { getOnChainInt: BigInt(q2) };
+    return { getOnChainInt: BigInt(q2) / 1000n };
   }
 }
 function pollPassQuorum(initialIndyDist, pollStatus, currentTime, minQuorum, treasuryIndyWithdrawnAmt) {
@@ -3126,7 +3049,7 @@ function serialiseVersionRecordDatum(d) {
 }
 
 // src/contracts/gov/transactions.ts
-async function createProposal(proposalContent, treasuryWithdrawal, sysParams, lucid, currentSlot, govOref, allIAssetOrefs) {
+async function createProposal(proposalContent, treasuryWithdrawal, sysParams, lucid, currentSlot, gov, allIAssetOrefs) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime4(network, currentSlot));
   const ownAddr = await lucid.wallet().address();
@@ -3147,10 +3070,7 @@ async function createProposal(proposalContent, treasuryWithdrawal, sysParams, lu
     ]),
     (_) => new Error("Expected a single poll auth token policy ref Script UTXO")
   );
-  const govUtxo = matchSingle(
-    await lucid.utxosByOutRef([govOref]),
-    (_) => new Error("Expected a single Gov UTXO")
-  );
+  const govUtxo = await resolveUtxo(gov, lucid, "Expected a single Gov UTXO");
   const govDatum = parseGovDatumOrThrow(getInlineDatumOrThrow(govUtxo));
   const votingEndTime = currentTime + govDatum.protocolParams.votingPeriod;
   const expirationTime = votingEndTime + govDatum.protocolParams.expirationPeriod;
@@ -3244,18 +3164,19 @@ async function createProposal(proposalContent, treasuryWithdrawal, sysParams, lu
     newPollId
   ];
 }
-async function createShardsChunks(chunkSize, pollManagerOref, sysParams, currentSlot, lucid) {
+async function createShardsChunks(chunkSize, pollManager, sysParams, currentSlot, lucid) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime4(network, currentSlot));
   const ownAddr = await lucid.wallet().address();
-  const pollManagerUtxo = matchSingle(
-    await lucid.utxosByOutRef([pollManagerOref]),
-    (_) => new Error("Expected a single Poll manager UTXO")
+  const pollManagerUtxo = await resolveUtxo(
+    pollManager,
+    lucid,
+    "Expected a single Poll manager UTXO"
   );
-  const pollManager = parsePollManagerOrThrow(
+  const pollManagerDatum = parsePollManagerOrThrow(
     getInlineDatumOrThrow(pollManagerUtxo)
   );
-  if (pollManager.createdShardsCount >= pollManager.totalShardsCount) {
+  if (pollManagerDatum.createdShardsCount >= pollManagerDatum.totalShardsCount) {
     throw new Error("All shards already created.");
   }
   const pollAuthTokenPolicyRefScriptUtxo = matchSingle(
@@ -3277,7 +3198,9 @@ async function createShardsChunks(chunkSize, pollManagerOref, sysParams, current
   const shardsCount = BigInt(
     Math.min(
       Number(chunkSize),
-      Number(pollManager.totalShardsCount - pollManager.createdShardsCount)
+      Number(
+        pollManagerDatum.totalShardsCount - pollManagerDatum.createdShardsCount
+      )
     )
   );
   const pollNft = fromSystemParamsAsset(sysParams.govParams.pollToken);
@@ -3293,8 +3216,8 @@ async function createShardsChunks(chunkSize, pollManagerOref, sysParams, current
       value: serialisePollDatum({
         PollManager: {
           content: {
-            ...pollManager,
-            createdShardsCount: pollManager.createdShardsCount + shardsCount
+            ...pollManagerDatum,
+            createdShardsCount: pollManagerDatum.createdShardsCount + shardsCount
           }
         }
       })
@@ -3309,9 +3232,9 @@ async function createShardsChunks(chunkSize, pollManagerOref, sysParams, current
         value: serialisePollDatum({
           PollShard: {
             content: {
-              pollId: pollManager.pollId,
+              pollId: pollManagerDatum.pollId,
               status: { yesVotes: 0n, noVotes: 0n },
-              votingEndTime: pollManager.votingEndTime,
+              votingEndTime: pollManagerDatum.votingEndTime,
               managerAddress: addressFromBech32(pollManagerUtxo.address)
             }
           }
@@ -3339,7 +3262,7 @@ function voteHelper(stakingPosLockedAmt, pollShard, voteOption, currentTime, ind
   ];
   return [new Map(newLockedAmt), newPollStatus];
 }
-async function vote(voteOption, pollShardOref, stakingPositionOref, sysParams, lucid, currentSlot) {
+async function vote(voteOption, pollShard, stakingPosition, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime4(network, currentSlot));
   const ownAddr = await lucid.wallet().address();
@@ -3357,16 +3280,18 @@ async function vote(voteOption, pollShardOref, stakingPositionOref, sysParams, l
     ]),
     (_) => new Error("Expected a single staking ref Script UTXO")
   );
-  const pollShardUtxo = matchSingle(
-    await lucid.utxosByOutRef([pollShardOref]),
-    (_) => new Error("Expected a single Poll shard UTXO")
+  const pollShardUtxo = await resolveUtxo(
+    pollShard,
+    lucid,
+    "Expected a single Poll shard UTXO"
   );
   const pollShardDatum = parsePollShardOrThrow(
     getInlineDatumOrThrow(pollShardUtxo)
   );
-  const stakingPosUtxo = matchSingle(
-    await lucid.utxosByOutRef([stakingPositionOref]),
-    (_) => new Error("Expected a single staking position UTXO")
+  const stakingPosUtxo = await resolveUtxo(
+    stakingPosition,
+    lucid,
+    "Expected a single staking position UTXO"
   );
   const stakingPosDatum = parseStakingPositionOrThrow(
     getInlineDatumOrThrow(stakingPosUtxo)
@@ -3386,7 +3311,12 @@ async function vote(voteOption, pollShardOref, stakingPositionOref, sysParams, l
     BigInt(validityFrom),
     indyStakedAmt
   );
-  return lucid.newTx().validFrom(validityFrom).validTo(Number(pollShardDatum.votingEndTime) - ONE_SECOND).readFrom([stakingRefScriptUtxo, pollShardRefScriptUtxo]).collectFrom([stakingPosUtxo], serialiseStakingRedeemer("Lock")).collectFrom(
+  return lucid.newTx().validFrom(validityFrom).validTo(
+    Math.min(
+      Number(pollShardDatum.votingEndTime) - ONE_SECOND,
+      Number(currentTime) + Number(sysParams.govParams.gBiasTime) - ONE_SECOND
+    )
+  ).readFrom([stakingRefScriptUtxo, pollShardRefScriptUtxo]).collectFrom([stakingPosUtxo], serialiseStakingRedeemer("Lock")).collectFrom(
     [pollShardUtxo],
     serialisePollShardRedeemer({ Vote: { content: voteOption } })
   ).pay.ToContract(
@@ -3415,7 +3345,7 @@ async function vote(voteOption, pollShardOref, stakingPositionOref, sysParams, l
     stakingPosUtxo.assets
   ).addSigner(ownAddr);
 }
-async function mergeShards(pollManagerOref, shardsOutRefs, sysParams, lucid, currentSlot) {
+async function mergeShards(pollManager, shardsOutRefs, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime4(network, currentSlot));
   const ownAddr = await lucid.wallet().address();
@@ -3443,9 +3373,10 @@ async function mergeShards(pollManagerOref, shardsOutRefs, sysParams, lucid, cur
     ]),
     (_) => new Error("Expected a single poll auth token policy ref Script UTXO")
   );
-  const pollManagerUtxo = matchSingle(
-    await lucid.utxosByOutRef([pollManagerOref]),
-    (_) => new Error("Expected a single Poll manager UTXO")
+  const pollManagerUtxo = await resolveUtxo(
+    pollManager,
+    lucid,
+    "Expected a single Poll manager UTXO"
   );
   const pollManagerDatum = parsePollManagerOrThrow(
     getInlineDatumOrThrow(pollManagerUtxo)
@@ -3506,7 +3437,7 @@ async function mergeShards(pollManagerOref, shardsOutRefs, sysParams, lucid, cur
     addAssets5(pollManagerUtxo.assets, shardsAggregatedAda)
   ).addSigner(ownAddr);
 }
-async function endProposal(pollManagerOref, govOref, sysParams, lucid, currentSlot) {
+async function endProposal(pollManager, gov, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime4(network, currentSlot));
   const ownAddr = await lucid.wallet().address();
@@ -3542,28 +3473,26 @@ async function endProposal(pollManagerOref, govOref, sysParams, lucid, currentSl
     ]),
     (_) => new Error("Expected a single upgrade auth token policy ref Script UTXO")
   );
-  const pollManagerUtxo = matchSingle(
-    await lucid.utxosByOutRef([pollManagerOref]),
-    (_) => new Error("Expected a single Poll manager UTXO")
+  const pollManagerUtxo = await resolveUtxo(
+    pollManager,
+    lucid,
+    "Expected a single Poll manager UTXO"
   );
-  const pollManager = parsePollManagerOrThrow(
+  const pollManagerDatum = parsePollManagerOrThrow(
     getInlineDatumOrThrow(pollManagerUtxo)
   );
-  const govUtxo = matchSingle(
-    await lucid.utxosByOutRef([govOref]),
-    (_) => new Error("Expected a single Gov UTXO")
-  );
+  const govUtxo = await resolveUtxo(gov, lucid, "Expected a single Gov UTXO");
   const govDatum = parseGovDatumOrThrow(getInlineDatumOrThrow(govUtxo));
   const pollNft = fromSystemParamsAsset(sysParams.govParams.pollToken);
   const indyAsset = fromSystemParamsAsset(
     sysParams.pollManagerParams.indyAsset
   );
-  const proposalExpired = currentTime > pollManager.expirationTime;
+  const proposalExpired = currentTime > pollManagerDatum.expirationTime;
   const proposalPassed = !proposalExpired && pollPassQuorum(
     sysParams.pollManagerParams.initialIndyDistribution,
-    pollManager.status,
+    pollManagerDatum.status,
     currentTime,
-    pollManager.minimumQuorum,
+    pollManagerDatum.minimumQuorum,
     govDatum.treasuryIndyWithdrawnAmt
   );
   const upgradeTokenVal = mkAssetsOf(
@@ -3600,12 +3529,12 @@ async function endProposal(pollManagerOref, govOref, sysParams, lucid, currentSl
       {
         kind: "inline",
         value: serialiseExecuteDatum({
-          id: pollManager.pollId,
-          content: pollManager.content,
+          id: pollManagerDatum.pollId,
+          content: pollManagerDatum.content,
           passedTime: currentTime,
-          votingEndTime: pollManager.votingEndTime,
-          protocolVersion: pollManager.protocolVersion,
-          treasuryWithdrawal: pollManager.treasuryWithdrawal
+          votingEndTime: pollManagerDatum.votingEndTime,
+          protocolVersion: pollManagerDatum.protocolVersion,
+          treasuryWithdrawal: pollManagerDatum.treasuryWithdrawal
         })
       },
       upgradeTokenVal
@@ -3622,14 +3551,11 @@ async function endProposal(pollManagerOref, govOref, sysParams, lucid, currentSl
   }
   return tx;
 }
-async function executeProposal(executeOref, govOref, treasuryWithdrawalOref, allIAssetOrefs, modifyIAssetOref, sysParams, lucid, currentSlot) {
+async function executeProposal(execute, gov, treasuryWithdrawal, allIAssetOrefs, modifyIAsset, sysParams, lucid, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime4(network, currentSlot));
   const ownAddr = await lucid.wallet().address();
-  const govUtxo = matchSingle(
-    await lucid.utxosByOutRef([govOref]),
-    (_) => new Error("Expected a single gov UTXO")
-  );
+  const govUtxo = await resolveUtxo(gov, lucid, "Expected a single gov UTXO");
   const govDatum = parseGovDatumOrThrow(getInlineDatumOrThrow(govUtxo));
   const govRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -3653,9 +3579,10 @@ async function executeProposal(executeOref, govOref, treasuryWithdrawalOref, all
     ]),
     (_) => new Error("Expected a single upgrade auth token policy ref Script UTXO")
   );
-  const executeUtxo = matchSingle(
-    await lucid.utxosByOutRef([executeOref]),
-    (_) => new Error("Expected a single execute UTXO")
+  const executeUtxo = await resolveUtxo(
+    execute,
+    lucid,
+    "Expected a single execute UTXO"
   );
   const executeDatum = parseExecuteDatumOrThrow(
     getInlineDatumOrThrow(executeUtxo)
@@ -3673,13 +3600,13 @@ async function executeProposal(executeOref, govOref, treasuryWithdrawalOref, all
     O7.fromNullable(executeDatum.treasuryWithdrawal),
     O7.match(
       () => {
-        if (treasuryWithdrawalOref) {
+        if (treasuryWithdrawal) {
           throw new Error("Cannot provide withdrawal oref when no withdrawal.");
         }
         return Promise.resolve();
       },
       async (withdrawal) => {
-        if (!treasuryWithdrawalOref) {
+        if (!treasuryWithdrawal) {
           throw new Error("Have to provide withdrawal oref when withdrawal.");
         }
         const treasuryRefScriptUtxo = matchSingle(
@@ -3690,9 +3617,10 @@ async function executeProposal(executeOref, govOref, treasuryWithdrawalOref, all
           ]),
           (_) => new Error("Expected a single Treasury Ref Script UTXO")
         );
-        const treasuryWithdrawalUtxo = matchSingle(
-          await lucid.utxosByOutRef([treasuryWithdrawalOref]),
-          (_) => new Error("Expected a single withdrawal UTXO")
+        const treasuryWithdrawalUtxo = await resolveUtxo(
+          treasuryWithdrawal,
+          lucid,
+          "Expected a single withdrawal UTXO"
         );
         const withdrawalVal = createValueFromWithdrawal(withdrawal);
         const withdrawalChangeVal = addAssets5(
@@ -3855,12 +3783,13 @@ async function executeProposal(executeOref, govOref, treasuryWithdrawalOref, all
       ]),
       (_) => new Error("Expected a single CDP Ref Script UTXO")
     );
-    if (!modifyIAssetOref) {
+    if (!modifyIAsset) {
       throw new Error("Have to provide iasset oref when modify asset.");
     }
-    const iassetUtxo = matchSingle(
-      await lucid.utxosByOutRef([modifyIAssetOref]),
-      (_) => new Error("Expected a single iasset UTXO")
+    const iassetUtxo = await resolveUtxo(
+      modifyIAsset,
+      lucid,
+      "Expected a single iasset UTXO"
     );
     const iassetDatum = parseIAssetDatumOrThrow(
       getInlineDatumOrThrow(iassetUtxo)
@@ -4200,7 +4129,7 @@ async function closeSpAccount(accountUtxo, params, lucid) {
     }
   ).addSignerKey(toHex(oldAccountDatum.owner));
 }
-async function processSpRequest(asset, stabilityPoolUtxo, accountUtxo, govUtxo, iAssetUtxo, newSnapshotUtxo, params, lucid, collectorOref) {
+async function processSpRequest(asset, stabilityPoolUtxo, accountUtxo, govUtxo, iAssetUtxo, newSnapshotUtxo, params, lucid, collector) {
   const redeemer = {
     ProcessRequest: {
       txHash: { hash: fromHex2(accountUtxo.txHash) },
@@ -4383,13 +4312,7 @@ async function processSpRequest(asset, stabilityPoolUtxo, accountUtxo, govUtxo,
       newPoolSum
     );
     if (rewardLovelacesFee > 0n) {
-      await collectorFeeTx(
-        rewardLovelacesFee,
-        lucid,
-        params,
-        tx,
-        collectorOref
-      );
+      await collectorFeeTx(rewardLovelacesFee, lucid, params, tx, collector);
     }
     tx.readFrom([govUtxo, iAssetUtxo, ...refInputs]);
     tx.pay.ToContract(
@@ -4500,7 +4423,7 @@ async function processSpRequest(asset, stabilityPoolUtxo, accountUtxo, govUtxo,
       params.scriptReferences.authTokenPolicies.accountTokenRef,
       lucid
     );
-    await collectorFeeTx(rewardLovelacesFee, lucid, params, tx, collectorOref);
+    await collectorFeeTx(rewardLovelacesFee, lucid, params, tx, collector);
     tx.readFrom([govUtxo, iAssetUtxo, accountTokenRef, ...refInputs]);
     tx.mintAssets(
       {
@@ -4598,9 +4521,16 @@ import {
   slotToUnixTime as slotToUnixTime5,
   toHex as toHex2
 } from "@lucid-evolution/lucid";
-async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
+async function openStakingPosition(amount, params, lucid, stakingManager) {
   const [pkh, _] = await addrDetails(lucid);
-  const stakingManagerOut = stakingManagerRef ? await findStakingManagerByOutRef(stakingManagerRef, lucid) : await findStakingManager(params, lucid);
+  const stakingManagerUtxo = await resolveUtxo(
+    stakingManager,
+    lucid,
+    "Expected a single staking manager UTXO"
+  );
+  const stakingManagerDatum = parseStakingManagerDatum(
+    getInlineDatumOrThrow(stakingManagerUtxo)
+  );
   const stakingRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(params.scriptReferences.stakingValidatorRef)
@@ -4616,39 +4546,39 @@ async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
     (_2) => new Error("Expected a single staking token policy Ref Script UTXO")
   );
   const newStakingManagerDatum = {
-    totalStake: stakingManagerOut.datum.totalStake + amount,
+    totalStake: stakingManagerDatum.totalStake + amount,
     managerSnapshot: {
-      snapshotAda: stakingManagerOut.datum.managerSnapshot.snapshotAda
+      snapshotAda: stakingManagerDatum.managerSnapshot.snapshotAda
     }
   };
   const stakingPositionDatum = {
     owner: fromHex3(pkh.hash),
     lockedAmount: /* @__PURE__ */ new Map([]),
     positionSnapshot: {
-      snapshotAda: stakingManagerOut.datum.managerSnapshot.snapshotAda
+      snapshotAda: stakingManagerDatum.managerSnapshot.snapshotAda
     }
   };
   const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + fromText6(params.stakingParams.stakingToken[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + fromText6(params.stakingParams.indyToken[1].unTokenName);
   return lucid.newTx().collectFrom(
-    [stakingManagerOut.utxo],
+    [stakingManagerUtxo],
     serialiseStakingRedeemer({
       CreateStakingPosition: { creatorPkh: pkh.hash }
     })
   ).readFrom([stakingRefScriptUtxo]).pay.ToContract(
-    stakingManagerOut.utxo.address,
+    stakingManagerUtxo.address,
     {
       kind: "inline",
       value: serialiseStakingDatum(newStakingManagerDatum)
     },
-    stakingManagerOut.utxo.assets
+    stakingManagerUtxo.assets
   ).readFrom([stakingTokenPolicyRefScriptUtxo]).mintAssets(
     {
       [stakingToken]: 1n
     },
     Data22.void()
   ).pay.ToContract(
-    stakingManagerOut.utxo.address,
+    stakingManagerUtxo.address,
     {
       kind: "inline",
       value: serialiseStakingDatum(stakingPositionDatum)
@@ -4659,14 +4589,25 @@ async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
     }
   ).addSignerKey(pkh.hash);
 }
-async function adjustStakingPosition(stakingPositionRef, amount, params, lucid, currentSlot, stakingManagerRef) {
+async function adjustStakingPosition(stakingPosition, amount, params, lucid, currentSlot, stakingManager) {
   const network = lucid.config().network;
   const currentTime = slotToUnixTime5(network, currentSlot) - 120 * ONE_SECOND;
-  const stakingPositionOut = await findStakingPositionByOutRef(
-    stakingPositionRef,
-    lucid
+  const stakingPositionUtxo = await resolveUtxo(
+    stakingPosition,
+    lucid,
+    "Expected a single staking position UTXO"
+  );
+  const stakingPositionDatum = parseStakingPositionOrThrow(
+    getInlineDatumOrThrow(stakingPositionUtxo)
+  );
+  const stakingManagerUtxo = await resolveUtxo(
+    stakingManager,
+    lucid,
+    "Expected a single staking manager UTXO"
+  );
+  const stakingManagerDatum = parseStakingManagerDatum(
+    getInlineDatumOrThrow(stakingManagerUtxo)
   );
-  const stakingManagerOut = stakingManagerRef ? await findStakingManagerByOutRef(stakingManagerRef, lucid) : await findStakingManager(params, lucid);
   const stakingRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(params.scriptReferences.stakingValidatorRef)
@@ -4674,44 +4615,44 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
     (_) => new Error("Expected a single staking Ref Script UTXO")
   );
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + fromText6(params.stakingParams.indyToken[1].unTokenName);
-  const existingIndyAmount = stakingPositionOut.utxo.assets[indyToken] ?? 0n;
-  const currentSnapshotAda = stakingManagerOut.datum.managerSnapshot.snapshotAda;
-  const oldSnapshotAda = stakingPositionOut.datum.positionSnapshot.snapshotAda;
+  const existingIndyAmount = stakingPositionUtxo.assets[indyToken] ?? 0n;
+  const currentSnapshotAda = stakingManagerDatum.managerSnapshot.snapshotAda;
+  const oldSnapshotAda = stakingPositionDatum.positionSnapshot.snapshotAda;
   const adaReward = (currentSnapshotAda - oldSnapshotAda) * existingIndyAmount / rewardSnapshotPrecision;
   const newLockedAmount = updateStakingLockedAmount(
-    stakingPositionOut.datum.lockedAmount,
+    stakingPositionDatum.lockedAmount,
     BigInt(currentTime)
   );
   return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo]).collectFrom(
-    [stakingPositionOut.utxo],
+    [stakingPositionUtxo],
     serialiseStakingRedeemer({
       AdjustStakedAmount: { adjustAmount: amount }
     })
   ).collectFrom(
-    [stakingManagerOut.utxo],
+    [stakingManagerUtxo],
     serialiseStakingRedeemer("UpdateTotalStake")
   ).pay.ToContract(
-    stakingManagerOut.utxo.address,
+    stakingManagerUtxo.address,
     {
       kind: "inline",
       value: serialiseStakingDatum({
-        ...stakingManagerOut.datum,
-        totalStake: stakingManagerOut.datum.totalStake + amount
+        ...stakingManagerDatum,
+        totalStake: stakingManagerDatum.totalStake + amount
       })
     },
-    addAssets6(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward))
+    addAssets6(stakingManagerUtxo.assets, mkLovelacesOf(-adaReward))
   ).pay.ToContract(
-    stakingPositionOut.utxo.address,
+    stakingPositionUtxo.address,
     {
       kind: "inline",
       value: serialiseStakingDatum({
-        ...stakingPositionOut.datum,
+        ...stakingPositionDatum,
         lockedAmount: newLockedAmount,
-        positionSnapshot: stakingManagerOut.datum.managerSnapshot
+        positionSnapshot: stakingManagerDatum.managerSnapshot
       })
     },
     addAssets6(
-      stakingPositionOut.utxo.assets,
+      stakingPositionUtxo.assets,
       mkAssetsOf(
         {
           currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol,
@@ -4720,16 +4661,27 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
         amount
       )
     )
-  ).addSignerKey(toHex2(stakingPositionOut.datum.owner));
+  ).addSignerKey(toHex2(stakingPositionDatum.owner));
 }
-async function closeStakingPosition(stakingPositionRef, params, lucid, currentSlot, stakingManagerRef) {
+async function closeStakingPosition(stakingPosition, params, lucid, currentSlot, stakingManager) {
   const network = lucid.config().network;
   const currentTime = slotToUnixTime5(network, currentSlot) - ONE_SECOND;
-  const stakingPositionOut = await findStakingPositionByOutRef(
-    stakingPositionRef,
-    lucid
+  const stakingPositionUtxo = await resolveUtxo(
+    stakingPosition,
+    lucid,
+    "Expected a single staking position UTXO"
+  );
+  const stakingPositionDatum = parseStakingPositionOrThrow(
+    getInlineDatumOrThrow(stakingPositionUtxo)
+  );
+  const stakingManagerUtxo = await resolveUtxo(
+    stakingManager,
+    lucid,
+    "Expected a single staking manager UTXO"
+  );
+  const stakingManagerDatum = parseStakingManagerDatum(
+    getInlineDatumOrThrow(stakingManagerUtxo)
   );
-  const stakingManagerOut = stakingManagerRef ? await findStakingManagerByOutRef(stakingManagerRef, lucid) : await findStakingManager(params, lucid);
   const stakingRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(params.scriptReferences.stakingValidatorRef)
@@ -4746,33 +4698,37 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
   );
   const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + fromText6(params.stakingParams.stakingToken[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + fromText6(params.stakingParams.indyToken[1].unTokenName);
-  const existingIndyAmount = stakingPositionOut.utxo.assets[indyToken] ?? 0n;
-  const currentSnapshotAda = stakingManagerOut.datum.managerSnapshot.snapshotAda;
-  const oldSnapshotAda = stakingPositionOut.datum.positionSnapshot.snapshotAda;
+  const existingIndyAmount = stakingPositionUtxo.assets[indyToken] ?? 0n;
+  const currentSnapshotAda = stakingManagerDatum.managerSnapshot.snapshotAda;
+  const oldSnapshotAda = stakingPositionDatum.positionSnapshot.snapshotAda;
   const adaReward = (currentSnapshotAda - oldSnapshotAda) * existingIndyAmount / (1000000n * 1000000n);
-  return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo]).collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer("Unstake")).collectFrom(
-    [stakingManagerOut.utxo],
+  return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo]).collectFrom([stakingPositionUtxo], serialiseStakingRedeemer("Unstake")).collectFrom(
+    [stakingManagerUtxo],
     serialiseStakingRedeemer("UpdateTotalStake")
   ).pay.ToContract(
-    stakingManagerOut.utxo.address,
+    stakingManagerUtxo.address,
     {
       kind: "inline",
       value: serialiseStakingDatum({
-        ...stakingManagerOut.datum,
-        totalStake: stakingManagerOut.datum.totalStake - existingIndyAmount
+        ...stakingManagerDatum,
+        totalStake: stakingManagerDatum.totalStake - existingIndyAmount
       })
     },
-    addAssets6(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward))
+    addAssets6(stakingManagerUtxo.assets, mkLovelacesOf(-adaReward))
   ).mintAssets(
     {
       [stakingToken]: -1n
     },
     Data22.void()
-  ).addSignerKey(toHex2(stakingPositionOut.datum.owner));
+  ).addSignerKey(toHex2(stakingPositionDatum.owner));
 }
 var MIN_UTXO_AMOUNT = 2000000n;
-async function distributeAda(stakingManagerRef, collectorRefs, params, lucid) {
-  const [stakingManagerUtxo] = await lucid.utxosByOutRef([stakingManagerRef]);
+async function distributeAda(stakingManager, collectorRefs, params, lucid) {
+  const stakingManagerUtxo = await resolveUtxo(
+    stakingManager,
+    lucid,
+    "Expected a single staking manager UTXO"
+  );
   const stakingManagerDatum = parseStakingManagerDatum(
     getInlineDatumOrThrow(stakingManagerUtxo)
   );
@@ -4942,16 +4898,16 @@ async function findInterestOracle(lucid, interestNft) {
 }
 
 // src/contracts/interest-oracle/transactions.ts
-async function startInterestOracle(initialUnitaryInterest, initialInterestRate, initialLastInterestUpdate, oracleParams, lucid, interestTokenName, withScriptRef = false, refOutRef) {
+async function startInterestOracle(initialUnitaryInterest, initialInterestRate, initialLastInterestUpdate, oracleParams, lucid, interestTokenName, withScriptRef = false, refUtxo) {
   const network = lucid.config().network;
   const tokenName = interestTokenName ?? "INTEREST_ORACLE";
-  if (!refOutRef) {
-    refOutRef = (await lucid.wallet().getUtxos())[0];
+  if (!refUtxo) {
+    refUtxo = (await lucid.wallet().getUtxos())[0];
   }
   const [tx, policyId] = await oneShotMintTx(lucid, {
     referenceOutRef: {
-      txHash: refOutRef.txHash,
-      outputIdx: BigInt(refOutRef.outputIndex)
+      txHash: refUtxo.txHash,
+      outputIdx: BigInt(refUtxo.outputIndex)
     },
     mintAmounts: [
       {
@@ -5532,21 +5488,18 @@ async function openLrp(assetTokenName, lovelacesAmt2, maxPrice, lucid, sysParams
     { lovelace: lovelacesAmt2 + MIN_LRP_COLLATERAL_AMT }
   );
 }
-async function cancelLrp(lrpOutRef, sysParams, lucid) {
+async function cancelLrp(lrp, sysParams, lucid) {
   const lrpScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(sysParams.scriptReferences.lrpValidatorRef)
     ]),
     (_) => new Error("Expected a single LRP Ref Script UTXO")
   );
-  const lrpUtxo = matchSingle(
-    await lucid.utxosByOutRef([lrpOutRef]),
-    (_) => new Error("Expected a single LRP UTXO.")
-  );
+  const lrpUtxo = await resolveUtxo(lrp, lucid, "Expected a single LRP UTXO.");
   const lrpDatum = parseLrpDatumOrThrow(getInlineDatumOrThrow(lrpUtxo));
   return lucid.newTx().readFrom([lrpScriptRefUtxo]).collectFrom([lrpUtxo], serialiseLrpRedeemer("Cancel")).addSignerKey(lrpDatum.owner);
 }
-async function redeemLrp(redemptionLrpsData, priceOracleOutRef, iassetOutRef, lucid, sysParams) {
+async function redeemLrp(redemptionLrpsData, priceOracle, iasset, lucid, sysParams) {
   const network = lucid.config().network;
   const lrpScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -5554,13 +5507,15 @@ async function redeemLrp(redemptionLrpsData, priceOracleOutRef, iassetOutRef, lu
     ]),
     (_) => new Error("Expected a single LRP Ref Script UTXO")
   );
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOutRef]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOutRef]),
-    (_) => new Error("Expected a single IAsset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single IAsset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
@@ -5585,17 +5540,14 @@ async function redeemLrp(redemptionLrpsData, priceOracleOutRef, iassetOutRef, lu
     )
   ).readFrom([lrpScriptRefUtxo]).readFrom([iassetUtxo, priceOracleUtxo]).compose(tx);
 }
-async function adjustLrp(lucid, lrpOutRef, lovelacesAdjustAmt, newMaxPrice, sysParams) {
+async function adjustLrp(lucid, lrp, lovelacesAdjustAmt, newMaxPrice, sysParams) {
   const lrpScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(sysParams.scriptReferences.lrpValidatorRef)
     ]),
     (_) => new Error("Expected a single LRP Ref Script UTXO")
   );
-  const lrpUtxo = matchSingle(
-    await lucid.utxosByOutRef([lrpOutRef]),
-    (_) => new Error("Expected a single LRP UTXO.")
-  );
+  const lrpUtxo = await resolveUtxo(lrp, lucid, "Expected a single LRP UTXO.");
   const lrpDatum = parseLrpDatumOrThrow(getInlineDatumOrThrow(lrpUtxo));
   const rewardAssetClass = {
     currencySymbol: sysParams.lrpParams.iassetPolicyId.unCurrencySymbol,
@@ -5632,8 +5584,8 @@ async function adjustLrp(lucid, lrpOutRef, lovelacesAdjustAmt, newMaxPrice, sysP
     )
   ).addSignerKey(lrpDatum.owner);
 }
-async function claimLrp(lucid, lrpOutRef, sysParams) {
-  return adjustLrp(lucid, lrpOutRef, 0n, void 0, sysParams);
+async function claimLrp(lucid, lrp, sysParams) {
+  return adjustLrp(lucid, lrp, 0n, void 0, sysParams);
 }
 
 // src/contracts/lrp/scripts.ts
@@ -5866,7 +5818,7 @@ function calculateLeverageFromCollateralRatio(iasset, collateralRatioPercentage,
 }
 
 // src/contracts/leverage/transactions.ts
-async function leverageCdpWithLrp(leverage, baseCollateral, priceOracleOutRef, iassetOutRef, cdpCreatorOref, interestOracleOref, collectorOref, sysParams, lucid, allLrps, currentSlot) {
+async function leverageCdpWithLrp(leverage, baseCollateral, priceOracle, iasset, cdpCreator, interestOracle, collector, sysParams, lucid, allLrps, currentSlot) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime7(network, currentSlot));
   const [pkh, skh] = await addrDetails(lucid);
@@ -5900,27 +5852,31 @@ async function leverageCdpWithLrp(leverage, baseCollateral, priceOracleOutRef, i
     ]),
     (_) => new Error("Expected a single iasset token policy Ref Script UTXO")
   );
-  const cdpCreatorUtxo = matchSingle(
-    await lucid.utxosByOutRef([cdpCreatorOref]),
-    (_) => new Error("Expected a single CDP creator UTXO")
+  const cdpCreatorUtxo = await resolveUtxo(
+    cdpCreator,
+    lucid,
+    "Expected a single CDP creator UTXO"
   );
-  const interestOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([interestOracleOref]),
-    (_) => new Error("Expected a single interest oracle UTXO")
+  const interestOracleUtxo = await resolveUtxo(
+    interestOracle,
+    lucid,
+    "Expected a single interest oracle UTXO"
   );
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
   );
-  const priceOracleUtxo = matchSingle(
-    await lucid.utxosByOutRef([priceOracleOutRef]),
-    (_) => new Error("Expected a single price oracle UTXO")
+  const priceOracleUtxo = await resolveUtxo(
+    priceOracle,
+    lucid,
+    "Expected a single price oracle UTXO"
   );
   const priceOracleDatum = parsePriceOracleDatum(
     getInlineDatumOrThrow(priceOracleUtxo)
   );
-  const iassetUtxo = matchSingle(
-    await lucid.utxosByOutRef([iassetOutRef]),
-    (_) => new Error("Expected a single IAsset UTXO")
+  const iassetUtxo = await resolveUtxo(
+    iasset,
+    lucid,
+    "Expected a single IAsset UTXO"
   );
   const iassetDatum = parseIAssetDatumOrThrow(
     getInlineDatumOrThrow(iassetUtxo)
@@ -6041,7 +5997,7 @@ async function leverageCdpWithLrp(leverage, baseCollateral, priceOracleOutRef, i
     2n
   );
   if (debtMintingFee > 0) {
-    await collectorFeeTx(debtMintingFee, lucid, sysParams, tx, collectorOref);
+    await collectorFeeTx(debtMintingFee, lucid, sysParams, tx, collector);
   }
   return tx;
 }
@@ -6224,6 +6180,7 @@ export {
   randomLrpsSubsetSatisfyingTargetLovelaces,
   redeemCdp,
   redeemLrp,
+  resolveUtxo,
   rewardSnapshotPrecision,
   runCreateScriptRefTx,
   runOneShotMintTx,