@fuel-ts/account 0.0.0-rc-2037-20240501105750 → 0.0.0-rc-2037-20240501152515

package/dist/test-utils.mjs

@@ -27,7 +27,7 @@ import { Address as Address3 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode15, FuelError as FuelError15 } from "@fuel-ts/errors";
 import { AbstractAccount } from "@fuel-ts/interfaces";
 import { bn as bn19 } from "@fuel-ts/math";
-import { arrayify as arrayify14, isDefined } from "@fuel-ts/utils";
+import { arrayify as arrayify14, isDefined as isDefined2 } from "@fuel-ts/utils";
 import { clone as clone4 } from "ramda";
 
 // src/providers/coin-quantity.ts
@@ -1248,7 +1248,7 @@ import {
   OutputType as OutputType2,
   TransactionType
 } from "@fuel-ts/transactions";
-import { concat, hexlify as hexlify7 } from "@fuel-ts/utils";
+import { concat, hexlify as hexlify7, isDefined } from "@fuel-ts/utils";
 
 // src/providers/resource.ts
 var isCoin = (resource) => "id" in resource;
@@ -1561,7 +1561,7 @@ function calculateMetadataGasForTxScript({
 }
 var calculateGasFee = (params) => {
   const { gas, gasPrice, priceFactor, tip } = params;
-  return gas.mul(gasPrice).div(priceFactor).add(tip);
+  return gas.mul(gasPrice).div(priceFactor).add(bn5(tip));
 };
 
 // src/providers/utils/json.ts
@@ -1764,10 +1764,10 @@ var BaseTransactionRequest = class {
     outputs,
     witnesses
   } = {}) {
-    this.tip = bn8(tip);
-    this.maturity = maturity ?? 0;
-    this.witnessLimit = witnessLimit ? bn8(witnessLimit) : void 0;
-    this.maxFee = maxFee ? bn8(maxFee) : void 0;
+    this.tip = tip ? bn8(tip) : void 0;
+    this.maturity = maturity && maturity > 0 ? maturity : void 0;
+    this.witnessLimit = isDefined(witnessLimit) ? bn8(witnessLimit) : void 0;
+    this.maxFee = bn8(maxFee);
     this.inputs = inputs ?? [];
     this.outputs = outputs ?? [];
     this.witnesses = witnesses ?? [];
@@ -1775,22 +1775,21 @@ var BaseTransactionRequest = class {
   static getPolicyMeta(req) {
     let policyTypes = 0;
     const policies = [];
-    if (req.tip) {
+    const { tip, witnessLimit, maturity } = req;
+    if (bn8(tip).gt(0)) {
       policyTypes += PolicyType.Tip;
-      policies.push({ data: req.tip, type: PolicyType.Tip });
+      policies.push({ data: bn8(tip), type: PolicyType.Tip });
     }
-    if (req.witnessLimit) {
+    if (isDefined(witnessLimit) && bn8(witnessLimit).gte(0)) {
       policyTypes += PolicyType.WitnessLimit;
-      policies.push({ data: req.witnessLimit, type: PolicyType.WitnessLimit });
+      policies.push({ data: bn8(witnessLimit), type: PolicyType.WitnessLimit });
     }
-    if (req.maturity > 0) {
+    if (maturity && maturity > 0) {
       policyTypes += PolicyType.Maturity;
-      policies.push({ data: req.maturity, type: PolicyType.Maturity });
-    }
-    if (req.maxFee) {
-      policyTypes += PolicyType.MaxFee;
-      policies.push({ data: req.maxFee, type: PolicyType.MaxFee });
+      policies.push({ data: maturity, type: PolicyType.Maturity });
     }
+    policyTypes += PolicyType.MaxFee;
+    policies.push({ data: req.maxFee, type: PolicyType.MaxFee });
     return {
       policyTypes,
       policies
@@ -5216,13 +5215,13 @@ var Account = class extends AbstractAccount {
     gasUsed,
     maxFee
   }) {
-    if (isDefined(setGasLimit) && gasUsed.gt(setGasLimit)) {
+    if (isDefined2(setGasLimit) && gasUsed.gt(setGasLimit)) {
       throw new FuelError15(
         ErrorCode15.GAS_LIMIT_TOO_LOW,
         `Gas limit '${setGasLimit}' is lower than the required: '${gasUsed}'.`
       );
     }
-    if (isDefined(setMaxFee) && maxFee.gt(setMaxFee)) {
+    if (isDefined2(setMaxFee) && maxFee.gt(setMaxFee)) {
       throw new FuelError15(
         ErrorCode15.MAX_FEE_TOO_LOW,
         `Max fee '${setMaxFee}' is lower than the required: '${maxFee}'.`