mainnet-js 1.1.0 → 1.1.1

package/src/wallet/Wif.ts

@@ -1481,6 +1481,10 @@ export class Wallet extends BaseWallet {
     mintRequests: TokenMintRequest | Array<TokenMintRequest>,
     deductTokenAmount: boolean = false
   ): Promise<SendResponse> {
+    if (tokenId?.length !== 64) {
+      throw Error(`Invalid tokenId supplied: ${tokenId}`);
+    }
+
     if (!Array.isArray(mintRequests)) {
       mintRequests = [mintRequests];
     }
@@ -1550,6 +1554,10 @@ export class Wallet extends BaseWallet {
     burnRequest: TokenBurnRequest,
     message?: string
   ): Promise<SendResponse> {
+    if (burnRequest.tokenId?.length !== 64) {
+      throw Error(`Invalid tokenId supplied: ${burnRequest.tokenId}`);
+    }
+
     const utxos = await this.getAddressUtxos(this.cashaddr!);
     const tokenUtxos = utxos.filter(
       (val) =>
@@ -1641,7 +1649,9 @@ export class Wallet extends BaseWallet {
    * @returns  {number} fungible token balance
    */
   public async getTokenBalance(tokenId: string): Promise<number> {
-    const utxos = await this.getAddressUtxos(this.cashaddr!);
+    const utxos = (await this.getTokenUtxos(tokenId)).filter(
+      (val) => val.token?.amount
+    );
     return sumTokenAmounts(utxos, tokenId);
   }
 
@@ -1653,7 +1663,9 @@ export class Wallet extends BaseWallet {
    * @returns  {number} non-fungible token balance
    */
   public async getNftTokenBalance(tokenId: string): Promise<number> {
-    const utxos = await this.getTokenUtxos(tokenId);
+    const utxos = (await this.getTokenUtxos(tokenId)).filter(
+      (val) => val.token?.commitment !== undefined
+    );
     return utxos.length;
   }
 
@@ -1661,9 +1673,11 @@ export class Wallet extends BaseWallet {
    * getAllTokenBalances Gets all fungible token balances in this wallet
    * @returns  {Object} a map [tokenId => balance] for all tokens in this wallet
    */
-  public async getAllTokenBalances(): Promise<Object> {
+  public async getAllTokenBalances(): Promise<{ [tokenId: string]: number }> {
     const result = {};
-    const utxos = await this.getTokenUtxos();
+    const utxos = (await this.getTokenUtxos()).filter(
+      (val) => val.token?.amount
+    );
     for (const utxo of utxos) {
       if (!result[utxo.token!.tokenId]) {
         result[utxo.token!.tokenId] = 0;
@@ -1677,9 +1691,13 @@ export class Wallet extends BaseWallet {
    * getAllNftTokenBalances Gets all non-fungible token (NFT) balances in this wallet
    * @returns  {Object} a map [tokenId => balance] for all NFTs in this wallet
    */
-  public async getAllNftTokenBalances(): Promise<Object> {
+  public async getAllNftTokenBalances(): Promise<{
+    [tokenId: string]: number;
+  }> {
     const result = {};
-    const utxos = await this.getTokenUtxos();
+    const utxos = (await this.getTokenUtxos()).filter(
+      (val) => val.token?.commitment !== undefined
+    );
     for (const utxo of utxos) {
       if (!result[utxo.token!.tokenId]) {
         result[utxo.token!.tokenId] = 0;