@stellar/stellar-base 14.0.0 → 14.0.2

package/lib/transaction_builder.js

@@ -694,14 +694,31 @@ var TransactionBuilder = exports.TransactionBuilder = /*#__PURE__*/function () {
     key: "buildFeeBumpTransaction",
     value: function buildFeeBumpTransaction(feeSource, baseFee, innerTx, networkPassphrase) {
       var innerOps = innerTx.operations.length;
-      var innerBaseFeeRate = new _bignumber["default"](innerTx.fee).div(innerOps);
+      var minBaseFee = new _bignumber["default"](BASE_FEE);
+      var innerInclusionFee = new _bignumber["default"](innerTx.fee).div(innerOps);
+      var resourceFee = new _bignumber["default"](0);
+
+      // Do we need to do special Soroban fee handling? We only want the fee-bump
+      // requirement to match the inclusion fee, not the inclusion+resource fee.
+      var env = innerTx.toEnvelope();
+      switch (env["switch"]().value) {
+        case _xdr["default"].EnvelopeType.envelopeTypeTx().value:
+          {
+            var _sorobanData$resource;
+            var sorobanData = env.v1().tx().ext().value();
+            resourceFee = new _bignumber["default"]((_sorobanData$resource = sorobanData === null || sorobanData === void 0 ? void 0 : sorobanData.resourceFee()) !== null && _sorobanData$resource !== void 0 ? _sorobanData$resource : 0);
+            innerInclusionFee = _bignumber["default"].max(minBaseFee, innerInclusionFee.minus(resourceFee));
+            break;
+          }
+        default:
+          break;
+      }
       var base = new _bignumber["default"](baseFee);
 
       // The fee rate for fee bump is at least the fee rate of the inner transaction
-      if (base.lt(innerBaseFeeRate)) {
-        throw new Error("Invalid baseFee, it should be at least ".concat(innerBaseFeeRate, " stroops."));
+      if (base.lt(innerInclusionFee)) {
+        throw new Error("Invalid baseFee, it should be at least ".concat(innerInclusionFee, " stroops."));
       }
-      var minBaseFee = new _bignumber["default"](BASE_FEE);
 
       // The fee rate is at least the minimum fee
       if (base.lt(minBaseFee)) {
@@ -732,7 +749,7 @@ var TransactionBuilder = exports.TransactionBuilder = /*#__PURE__*/function () {
       }
       var tx = new _xdr["default"].FeeBumpTransaction({
         feeSource: feeSourceAccount,
-        fee: _xdr["default"].Int64.fromString(base.times(innerOps + 1).toString()),
+        fee: _xdr["default"].Int64.fromString(base.times(innerOps + 1).plus(resourceFee).toString()),
         innerTx: _xdr["default"].FeeBumpTransactionInnerTx.envelopeTypeTx(innerTxEnvelope.v1()),
         ext: new _xdr["default"].FeeBumpTransactionExt(0)
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar/stellar-base",
-  "version": "14.0.0",
+  "version": "14.0.2",
   "description": "Low-level support library for the Stellar network.",
   "main": "./lib/index.js",
   "browser": {

package/types/index.d.ts

@@ -79,6 +79,7 @@ export class Asset {
   toChangeTrustXDRObject(): xdr.ChangeTrustAsset;
   toTrustLineXDRObject(): xdr.TrustLineAsset;
   contractId(networkPassphrase: string): string;
+  toString(): string;
 
   code: string;
   issuer: string;