patch: recursively reevaluate

butaneprotocol · Sep 8, 2024 · 5369627 · 5369627
1 parent de955cd
commit 5369627
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.changeset/bright-pillows-melt.md b/.changeset/bright-pillows-melt.md
@@ -0,0 +1,5 @@
+---
+"@blaze-cardano/tx": patch
+---
+
+patch: evaluate recursively
diff --git a/packages/blaze-tx/src/tx.ts b/packages/blaze-tx/src/tx.ts
@@ -1440,10 +1440,10 @@ export class TxBuilder {
       new Value(-(bigintMax(this.fee, this.minimumFee) + this.feePadding)),
     );
     this.balanceChange(excessValue);
+    let evaluationFee: bigint = 0n;
     if (this.redeemers.size() > 0) {
       this.prepareCollateral();
       tw = this.buildTransactionWitnessSet();
-      let evaluationFee: bigint = 0n;
       try {
         evaluationFee = await this.evaluate(draft_tx);
       } catch (e) {
@@ -1479,6 +1479,7 @@ export class TxBuilder {
     }
     let final_size = draft_tx.toCbor().length / 2;
     do {
+      const oldEvaluationFee = evaluationFee;
       this.fee += BigInt(
         Math.ceil((final_size - draft_size) * this.params.minFeeCoefficient),
       );
@@ -1504,6 +1505,13 @@ export class TxBuilder {
         for (const input of selectionResult.selectedInputs) {
           this.addInput(input);
         }
+        draft_tx.setBody(this.body);
+        if (evaluationFee > 0) {
+          evaluationFee = await this.evaluate(draft_tx);
+          if (evaluationFee > oldEvaluationFee) {
+            continue;
+          }
+        }
       }
       if (this.body.collateral()) {
         this.balanceCollateralChange();