Rewrite transaction balance / fee calculation logic

.changeset/chilled-bats-warn.md

@@ -0,0 +1,5 @@
+---
+"@blaze-cardano/tx": minor
+---
+
+Completely rewrites a lot of the completion logic for building transactions, including fee calculation and collateral selection. It also adds a new coin selection algorithm as an optional export, based on the HVF algorithm.

.github/workflows/release.yml

@@ -1,5 +1,4 @@
 name: Release
-
 on:
   push:
     branches:
@@ -19,10 +18,8 @@ jobs:
     steps:
       - name: 📥 Checkout repository
         uses: actions/checkout@v4
-
       - name: 📦 Setup pnpm
         uses: pnpm/action-setup@v4
-
       - name: 📦 Setup Node.js
         uses: actions/setup-node@v4
         with:

package.json

@@ -11,7 +11,8 @@
     "docs": "typedoc --skipErrorChecking && mkdir docs/logo && cp logo/BLAZE_LOGO2.svg docs/logo/BLAZE_LOGO2.svg",
     "fmt": "prettier -w .",
     "changeset": "changeset",
-    "release": "turbo run build && changeset publish"
+    "release": "turbo run build && changeset publish",
+    "release-dev": "turbo run build && changeset version --snapshot && changeset publish --tag dev"
   },
   "devDependencies": {
     "@blaze-cardano/eslint-config": "workspace:*",

packages/blaze-blueprint/test/plutus.ts

@@ -1,50 +1,99 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 import { type Script } from "@blaze-cardano/core";
-import { applyParamsToScript, cborToScript } from "@blaze-cardano/uplc";import { type PlutusData } from "@blaze-cardano/core";
+import { applyParamsToScript, cborToScript } from "@blaze-cardano/uplc";
+
+
+export type ByteArray = string;
+export type Data = any;
+export type Int = bigint;
+
 
 export interface AlwaysTrueScriptSpend {
-    new (_param1:bigint,_param2:string): Script;
-_datum: Array<bigint>;
-    _redeemer: bigint;
-  };
+  scriptBytes: string;
+  new(_param1: Int,
+  _param2: ByteArray): Script;
+  _datum: Array<Int>;
+  _redeemer: Int;
+}
+export const AlwaysTrueScriptSpend = Object.assign(
+  function (_param1: Int,_param2: ByteArray) {
+    return cborToScript(
+      applyParamsToScript(
+        AlwaysTrueScriptSpend.scriptBytes, 
+        [_param1, _param2],
+        {"dataType":"list","items":[{"dataType":"integer"},{"dataType":"bytes"}]} as any,
+      ),
+      "PlutusV3",
+    );
+  },
+  { scriptBytes: "58650101003232323232232232253330063232323232533300b3370e900118061baa0011323322324a26eb4014c03c004c03cc040004c034dd50008b1806980700198060011805801180580098041baa00114984d958dd70009bad0015734aae7555cf2ba15745" },
+  { _datum: {"dataType":"list","items":{"dataType":"integer"}} },
+  { _redeemer: {"dataType":"integer"} },
+) as unknown as AlwaysTrueScriptSpend;
 
-  export const AlwaysTrueScriptSpend = Object.assign(
-    function (_param1:bigint,_param2:string) {return cborToScript(applyParamsToScript("58650101003232323232232232253330063232323232533300b3370e900118061baa0011323322324a26eb4014c03c004c03cc040004c034dd50008b1806980700198060011805801180580098041baa00114984d958dd70009bad0015734aae7555cf2ba15745", [_param1,_param2], {"dataType":"list","items":[{"dataType":"integer"},{"dataType":"bytes"}]} as any), "PlutusV3");},
-    {_datum: {"dataType":"list","items":{"dataType":"integer"}}},
-    {_redeemer: {"dataType":"integer"}},
-  ) as unknown as AlwaysTrueScriptSpend;
 
 export interface AlwaysTrueScriptElse {
-    new (_param1:bigint,_param2:string): Script;
-
-  };
+  scriptBytes: string;
+  new(_param1: Int,
+  _param2: ByteArray): Script;
+  undefined: any;
+}
+export const AlwaysTrueScriptElse = Object.assign(
+  function (_param1: Int,_param2: ByteArray) {
+    return cborToScript(
+      applyParamsToScript(
+        AlwaysTrueScriptElse.scriptBytes, 
+        [_param1, _param2],
+        {"dataType":"list","items":[{"dataType":"integer"},{"dataType":"bytes"}]} as any,
+      ),
+      "PlutusV3",
+    );
+  },
+  { scriptBytes: "58650101003232323232232232253330063232323232533300b3370e900118061baa0011323322324a26eb4014c03c004c03cc040004c034dd50008b1806980700198060011805801180580098041baa00114984d958dd70009bad0015734aae7555cf2ba15745" },
+  { undefined: {} },
+) as unknown as AlwaysTrueScriptElse;
 
-  export const AlwaysTrueScriptElse = Object.assign(
-    function (_param1:bigint,_param2:string) {return cborToScript(applyParamsToScript("58650101003232323232232232253330063232323232533300b3370e900118061baa0011323322324a26eb4014c03c004c03cc040004c034dd50008b1806980700198060011805801180580098041baa00114984d958dd70009bad0015734aae7555cf2ba15745", [_param1,_param2], {"dataType":"list","items":[{"dataType":"integer"},{"dataType":"bytes"}]} as any), "PlutusV3");},
-
-
-  ) as unknown as AlwaysTrueScriptElse;
 
 export interface NestedSometimesTrueScriptSpend {
-    new (param:bigint): Script;
-datum: PlutusData;
-    redeemer: bigint;
-  };
+  scriptBytes: string;
+  new(param: Int): Script;
+  datum: Data;
+  redeemer: Int;
+}
+export const NestedSometimesTrueScriptSpend = Object.assign(
+  function (param: Int) {
+    return cborToScript(
+      applyParamsToScript(
+        NestedSometimesTrueScriptSpend.scriptBytes, 
+        [param],
+        {"dataType":"list","items":[{"dataType":"integer"}]} as any,
+      ),
+      "PlutusV3",
+    );
+  },
+  { scriptBytes: "5862010100323232323223225333004323232323253330093370e900118051baa0011323322337100146eb4014c034004c034c038004c02cdd50008b1805980600198050011804801180480098031baa00114984d958dd6800ab9a5573aaae795d0aba21" },
+  { datum: {"title":"Data","description":"Any Plutus data."} },
+  { redeemer: {"dataType":"integer"} },
+) as unknown as NestedSometimesTrueScriptSpend;
 
-  export const NestedSometimesTrueScriptSpend = Object.assign(
-    function (param:bigint) {return cborToScript(applyParamsToScript("5862010100323232323223225333004323232323253330093370e900118051baa0011323322337100146eb4014c034004c034c038004c02cdd50008b1805980600198050011804801180480098031baa00114984d958dd6800ab9a5573aaae795d0aba21", [param], {"dataType":"list","items":[{"dataType":"integer"}]} as any), "PlutusV3");},
-    {datum: {"title":"Data","description":"Any Plutus data."}},
-    {redeemer: {"dataType":"integer"}},
-  ) as unknown as NestedSometimesTrueScriptSpend;
 
 export interface NestedSometimesTrueScriptElse {
-    new (param:bigint): Script;
-
-  };
-
-  export const NestedSometimesTrueScriptElse = Object.assign(
-    function (param:bigint) {return cborToScript(applyParamsToScript("5862010100323232323223225333004323232323253330093370e900118051baa0011323322337100146eb4014c034004c034c038004c02cdd50008b1805980600198050011804801180480098031baa00114984d958dd6800ab9a5573aaae795d0aba21", [param], {"dataType":"list","items":[{"dataType":"integer"}]} as any), "PlutusV3");},
-
-
-  ) as unknown as NestedSometimesTrueScriptElse;
+  scriptBytes: string;
+  new(param: Int): Script;
+  undefined: any;
+}
+export const NestedSometimesTrueScriptElse = Object.assign(
+  function (param: Int) {
+    return cborToScript(
+      applyParamsToScript(
+        NestedSometimesTrueScriptElse.scriptBytes, 
+        [param],
+        {"dataType":"list","items":[{"dataType":"integer"}]} as any,
+      ),
+      "PlutusV3",
+    );
+  },
+  { scriptBytes: "5862010100323232323223225333004323232323253330093370e900118051baa0011323322337100146eb4014c034004c034c038004c02cdd50008b1805980600198050011804801180480098031baa00114984d958dd6800ab9a5573aaae795d0aba21" },
+  { undefined: {} },
+) as unknown as NestedSometimesTrueScriptElse;

packages/blaze-emulator/src/emulator.ts

@@ -709,15 +709,19 @@ export class Emulator {
         ),
       );
 
+    let refScriptFee = 0n;
     if (refInputs && this.params.minFeeReferenceScripts) {
       const refScripts = [...inputs, ...refInputs]
         .map((x) => this.getOutput(x)!.scriptRef())
         .filter((x) => x !== undefined);
-      fee += BigInt(
+
+      refScriptFee += BigInt(
         Math.ceil(calculateReferenceScriptFee(refScripts, this.params)),
       );
     }
 
+    fee += refScriptFee;
+
     if (fee > body.fee())
       throw new Error(
         `Insufficient transaction fee. Supplied: ${body.fee()}, Required: ${fee}`,

packages/blaze-emulator/test/Emulator.test.ts

@@ -78,7 +78,7 @@ describe("Emulator", () => {
     expect(out.amount().coin()).toEqual(2_000_000_000n);
   });
 
-  test("Should be able to spend from a script", async () => {
+  test("Should be able to spend from a script only", async () => {
     const tx = await blaze
       .newTransaction()
       .lockAssets(
@@ -136,7 +136,6 @@ describe("Emulator", () => {
     //   refIn,
     //   emulator.getOutput(refIn)!
     // );
-
     const tx = await blaze
       .newTransaction()
       .lockAssets(