@stellar/stellar-base 14.0.1 → 14.0.3

package/lib/numbers/index.js

@@ -72,6 +72,8 @@ function scValToBigInt(scv) {
       return BigInt(scv.value());
     case 'scvU64':
     case 'scvI64':
+    case 'scvTimepoint':
+    case 'scvDuration':
       return new _xdr_large_int.XdrLargeInt(scIntType, scv.value()).toBigInt();
     case 'scvU128':
     case 'scvI128':

package/lib/numbers/xdr_large_int.js

@@ -65,6 +65,8 @@ var XdrLargeInt = exports.XdrLargeInt = /*#__PURE__*/function () {
         this["int"] = new _int2.Int256(values);
         break;
       case 'u64':
+      case 'timepoint':
+      case 'duration':
         this["int"] = new _jsXdr.UnsignedHyper(values);
         break;
       case 'u128':
@@ -121,6 +123,24 @@ var XdrLargeInt = exports.XdrLargeInt = /*#__PURE__*/function () {
       );
     }
 
+    /** @returns {xdr.ScVal} the integer encoded with `ScValType = Timepoint` */
+  }, {
+    key: "toTimepoint",
+    value: function toTimepoint() {
+      this._sizeCheck(64);
+      return _xdr["default"].ScVal.scvTimepoint(new _xdr["default"].Uint64(BigInt.asUintN(64, this.toBigInt())) // reiterpret as unsigned
+      );
+    }
+
+    /** @returns {xdr.ScVal} the integer encoded with `ScValType = Duration` */
+  }, {
+    key: "toDuration",
+    value: function toDuration() {
+      this._sizeCheck(64);
+      return _xdr["default"].ScVal.scvDuration(new _xdr["default"].Uint64(BigInt.asUintN(64, this.toBigInt())) // reiterpret as unsigned
+      );
+    }
+
     /**
      * @returns {xdr.ScVal} the integer encoded with `ScValType = I128`
      * @throws {RangeError} if the value cannot fit in 128 bits
@@ -205,6 +225,10 @@ var XdrLargeInt = exports.XdrLargeInt = /*#__PURE__*/function () {
           return this.toU128();
         case 'u256':
           return this.toU256();
+        case 'timepoint':
+          return this.toTimepoint();
+        case 'duration':
+          return this.toDuration();
         default:
           throw TypeError("invalid type: ".concat(this.type));
       }
@@ -244,6 +268,8 @@ var XdrLargeInt = exports.XdrLargeInt = /*#__PURE__*/function () {
         case 'u64':
         case 'u128':
         case 'u256':
+        case 'timepoint':
+        case 'duration':
           return true;
         default:
           return false;

package/lib/scval.js

@@ -303,7 +303,7 @@ function nativeToScVal(val) {
  *
  *  - void -> `null`
  *  - u32, i32 -> `number`
- *  - u64, i64, u128, i128, u256, i256 -> `bigint`
+ *  - u64, i64, u128, i128, u256, i256, timepoint, duration -> `bigint`
  *  - vec -> `Array` of any of the above (via recursion)
  *  - map -> key-value object of any of the above (via recursion)
  *  - bool -> `boolean`

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.1",
+  "version": "14.0.3",
   "description": "Low-level support library for the Stellar network.",
   "main": "./lib/index.js",
   "browser": {