fix tokenamount toJSON return type

saber-hq · Jun 5, 2022 · 4d342bc · 4d342bc
1 parent 7522d54
commit 4d342bc
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/packages/token-utils/src/tokenAmount.ts b/packages/token-utils/src/tokenAmount.ts
@@ -1,5 +1,5 @@
 import { u64 } from "@solana/spl-token";
-import type { BigintIsh } from "@ubeswap/token-math";
+import type { BigintIsh, FractionObject } from "@ubeswap/token-math";
 import {
   parseAmountFromString,
   parseBigintIsh,
@@ -12,6 +12,21 @@ import type { Token } from "./token.js";
 
 export type { IFormatUint } from "@ubeswap/token-math";
 
+export interface TokenAmountObject extends FractionObject {
+  /**
+   * Discriminator to show this is a token amount.
+   */
+  _isTA: true;
+  /**
+   * Mint of the token.
+   */
+  mint: string;
+  /**
+   * Amount of tokens in string representation.
+   */
+  uiAmount: string;
+}
+
 export class TokenAmount extends UTokenAmount<Token> {
   // amount _must_ be raw, i.e. in the native representation
   constructor(token: Token, amount: BigintIsh) {
@@ -56,21 +71,9 @@ export class TokenAmount extends UTokenAmount<Token> {
   /**
    * JSON representation of the token amount.
    */
-  toJSON(): {
-    /**
-     * Discriminator to show this is a token amount.
-     */
-    _isTA: true;
-    /**
-     * Mint of the token.
-     */
-    mint: string;
-    /**
-     * Amount of tokens in string representation.
-     */
-    uiAmount: string;
-  } {
+  override toJSON(): TokenAmountObject {
     return {
+      ...super.toJSON(),
       _isTA: true,
       mint: this.token.address,
       uiAmount: this.toExact(),