fix: patch support for timepoint and duration scvals (#819)

* fix: patch support for timepoint and duration scvals

Author: mootz12

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixed
+
+- Add conversions for timepoint and duration scval types ([#819](https://github.com/stellar/js-stellar-base/pull/819))
+
 ## [`v14.0.2`](https://github.com/stellar/js-stellar-base/compare/v14.0.1...v14.0.2):
 
 ### Fixed

src/numbers/index.js

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

src/numbers/xdr_large_int.js

@@ -56,6 +56,8 @@ export class XdrLargeInt {
         this.int = new Int256(values);
         break;
       case 'u64':
+      case 'timepoint':
+      case 'duration':
         this.int = new UnsignedHyper(values);
         break;
       case 'u128':
@@ -111,6 +113,22 @@ export class XdrLargeInt {
     );
   }
 
+  /** @returns {xdr.ScVal} the integer encoded with `ScValType = Timepoint` */
+  toTimepoint() {
+    this._sizeCheck(64);
+    return xdr.ScVal.scvTimepoint(
+      new xdr.Uint64(BigInt.asUintN(64, this.toBigInt())) // reiterpret as unsigned
+    );
+  }
+
+  /** @returns {xdr.ScVal} the integer encoded with `ScValType = Duration` */
+  toDuration() {
+    this._sizeCheck(64);
+    return xdr.ScVal.scvDuration(
+      new xdr.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
@@ -197,6 +215,10 @@ export class XdrLargeInt {
         return this.toU128();
       case 'u256':
         return this.toU256();
+      case 'timepoint':
+        return this.toTimepoint();
+      case 'duration':
+        return this.toDuration();
       default:
         throw TypeError(`invalid type: ${this.type}`);
     }
@@ -231,6 +253,8 @@ export class XdrLargeInt {
       case 'u64':
       case 'u128':
       case 'u256':
+      case 'timepoint':
+      case 'duration':
         return true;
       default:
         return false;

src/scval.js

@@ -294,7 +294,7 @@ export function nativeToScVal(val, opts = {}) {
  *
  *  - 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`

test/unit/scint_test.js

@@ -51,6 +51,24 @@ describe('creating large integers', function () {
       expect(u64.high).to.equal(-1);
     });
 
+    it('handles timepoint', function () {
+      let b = new StellarBase.ScInt(sentinel);
+      expect(b.toBigInt()).to.equal(sentinel);
+      expect(b.toNumber()).to.equal(Number(sentinel));
+      let u64 = b.toTimepoint().timepoint();
+      expect(u64.low).to.equal(Number(sentinel));
+      expect(u64.high).to.equal(0);
+    });
+
+    it('handles duration', function () {
+      let b = new StellarBase.ScInt(sentinel);
+      expect(b.toBigInt()).to.equal(sentinel);
+      expect(b.toNumber()).to.equal(Number(sentinel));
+      let u64 = b.toDuration().duration();
+      expect(u64.low).to.equal(Number(sentinel));
+      expect(u64.high).to.equal(0);
+    });
+
     it('handles i64', function () {
       let b = new StellarBase.ScInt(sentinel);
       expect(b.toBigInt()).to.equal(sentinel);

test/unit/scval_test.js

@@ -17,6 +17,8 @@ describe('parsing and building ScVals', function () {
     i32: xdr.ScVal.scvI32(1),
     u64: 1n,
     i64: -1n,
+    timepoint: new ScInt(1443571200n).toTimepoint(),
+    duration: new ScInt(1000n).toDuration(),
     u128: new ScInt(1).toU128(),
     i128: new ScInt(1).toI128(),
     u256: new ScInt(1).toU256(),
@@ -32,6 +34,7 @@ describe('parsing and building ScVals', function () {
   const targetScv = xdr.ScVal.scvMap(
     [
       ['bool', xdr.ScVal.scvBool(true)],
+      ['duration', new ScInt(1000n, { type: 'duration' }).toScVal()],
       ['i128', new ScInt(1, { type: 'i128' }).toScVal()],
       ['i256', new ScInt(1, { type: 'i256' }).toScVal()],
       ['i32', xdr.ScVal.scvI32(1)],
@@ -53,6 +56,7 @@ describe('parsing and building ScVals', function () {
           })
         ])
       ],
+      ['timepoint', new ScInt(1443571200n, { type: 'timepoint' }).toScVal()],
       ['u128', new ScInt(1, { type: 'u128' }).toScVal()],
       ['u256', new ScInt(1, { type: 'u256' }).toScVal()],
       ['u32', xdr.ScVal.scvU32(1)],
@@ -156,6 +160,8 @@ describe('parsing and building ScVals', function () {
       [1, 'i64', 'scvI64'],
       [1, 'i128', 'scvI128'],
       [1, 'u256', 'scvU256'],
+      [2, 'timepoint', 'scvTimepoint'],
+      [3, 'duration', 'scvDuration'],
       ['a', 'symbol', 'scvSymbol'],
       ['a', undefined, 'scvString'],
       [Keypair.random(), undefined, 'scvAddress'],