Fixes Collateral Calculation (#184)

* fix: incorrect math for collateral * chore: changeset
butaneprotocol · Sep 26, 2024 · 0a667b8 · 0a667b8
1 parent 6212771
commit 0a667b8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/weak-squids-camp.md b/.changeset/weak-squids-camp.md
@@ -0,0 +1,6 @@
+---
+"@blaze-cardano/emulator": minor
+"@blaze-cardano/tx": minor
+---
+
+This fixes incorrect calculation for collateral values from a recent fix.
diff --git a/packages/blaze-emulator/src/emulator.ts b/packages/blaze-emulator/src/emulator.ts
@@ -504,7 +504,7 @@ export class Emulator {
 
     // Minimum collateral amount included
     const minCollateral = BigInt(
-      Math.ceil((this.params.collateralPercentage * Number(body.fee())) / 100),
+      Math.ceil((this.params.collateralPercentage / 100) * Number(body.fee())),
     );
 
     // If any scripts have been invoked, minimum collateral must be included

diff --git a/packages/blaze-tx/src/tx.ts b/packages/blaze-tx/src/tx.ts
@@ -1413,9 +1413,8 @@ export class TxBuilder {
     // Calculate the total collateral based on the transaction fee and collateral percentage.
     const totalCollateral = BigInt(
       Math.ceil(
-        (this.params.collateralPercentage *
-          Number(bigintMax(this.fee, this.minimumFee) + this.feePadding)) /
-          100,
+        (this.params.collateralPercentage / 100) *
+          Number(bigintMax(this.fee, this.minimumFee) + this.feePadding),
       ),
     );
     // Calculate the collateral value by summing up the amounts from collateral inputs.