@otoplo/wallet-common 0.1.15 → 0.2.0

package/dist/types/utils/asset.d.ts

@@ -1,9 +1,6 @@
-import { TokenEntity } from '../types/db.types';
-export declare function getNiftyToken(): TokenEntity;
-export declare function fetchNiftyNFT(id: string): Promise<Uint8Array>;
-export declare function isNiftySubgroup(group: string): boolean;
-export declare function fetchAssetDoc(url: string): Promise<any>;
-export declare function fetchAssetBlob(url: string): Promise<Uint8Array>;
+import { AssetInfo } from '../types';
 export declare function transformTokenIconUrl(icon: string, documentUrl: string): string;
 export declare function parseTokenDataUrl(data?: string): string | null;
+export declare function getAssetMetadata(token: string): Promise<AssetInfo>;
+export declare function getAssetFileUrl(token: string, asset: string): string;
 //# sourceMappingURL=asset.d.ts.map

package/dist/types/utils/asset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asset.d.ts","sourceRoot":"","sources":["../../../src/utils/asset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,wBAAgB,aAAa,IAAI,WAAW,CAc3C;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAE7D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAWtD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAKvD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAK/D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAY/E;AAED,wBAAgB,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK9D"}
+{"version":3,"file":"asset.d.ts","sourceRoot":"","sources":["../../../src/utils/asset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAY/E;AAED,wBAAgB,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK9D;AAYD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAElE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnE"}

package/dist/types/utils/common.d.ts

@@ -23,5 +23,4 @@ export declare function getFileMediaType(filename: string): 'video' | 'audio' |
 export declare function getFileMimeType(filename: string): string;
 export declare function sleep(ms: number): Promise<void>;
 export declare function prettifyAmount(amount: string | number): string;
-export declare function calcAmountValue(amount: string | number, price: number, prettify?: boolean): string;
 //# sourceMappingURL=common.d.ts.map

package/dist/types/utils/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAsC,MAAM,YAAY,CAAC;AACtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGrD,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,SAAS,uBAAuB,CAAC;AAC9C,eAAO,MAAM,iBAAiB,SAAS,CAAC;AACxC,eAAO,MAAM,mBAAmB,iDAAkD,CAAC;AAEnF,wBAAgB,SAAS,IAAI,OAAO,CAEnC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,cAAkC,GAAG,OAAO,CAEnG;AAED,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKjF;AAED,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI,GAAG,GAAG,IAAI,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,CAE5F;AAED,wBAAgB,oBAAoB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,SAAI,GAAG,MAAM,CAWxE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAK5D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKlD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKpD;AAED,wBAAgB,wBAAwB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAQlF;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAOvD;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAc7F;AA4BD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAM1F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAM9D;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,MAAM,CAIhG"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAsC,MAAM,YAAY,CAAC;AACtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGrD,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,SAAS,uBAAuB,CAAC;AAC9C,eAAO,MAAM,iBAAiB,SAAS,CAAC;AACxC,eAAO,MAAM,mBAAmB,iDAAkD,CAAC;AAEnF,wBAAgB,SAAS,IAAI,OAAO,CAEnC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,cAAkC,GAAG,OAAO,CAEnG;AAED,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKjF;AAED,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI,GAAG,GAAG,IAAI,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,CAE5F;AAED,wBAAgB,oBAAoB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,SAAI,GAAG,MAAM,CAWxE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAK5D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKlD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKpD;AAED,wBAAgB,wBAAwB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAQlF;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAOvD;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAc7F;AA4BD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAM1F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAM9D"}

package/dist/types/utils/enums.d.ts

@@ -13,8 +13,4 @@ export declare enum SessionRequestType {
     SignTransaction = "signTransaction",
     SendTransaction = "sendTransaction"
 }
-export declare enum AssetType {
-    TOKEN = "token",
-    NFT = "nft"
-}
 //# sourceMappingURL=enums.d.ts.map

package/dist/types/utils/enums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../../src/utils/enums.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,IAAI,IAAI;CACT;AAED,oBAAY,QAAQ;IAClB,OAAO,IAAI;IACX,MAAM,IAAI;CACX;AAED,oBAAY,kBAAkB;IAC5B,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,eAAe,oBAAoB;CACpC;AAED,oBAAY,SAAS;IACnB,KAAK,UAAU;IACf,GAAG,QAAQ;CACZ"}
+{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../../src/utils/enums.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,IAAI,IAAI;CACT;AAED,oBAAY,QAAQ;IAClB,OAAO,IAAI;IACX,MAAM,IAAI;CACX;AAED,oBAAY,kBAAkB;IAC5B,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,eAAe,oBAAoB;CACpC"}

package/dist/types/utils/index.d.ts

@@ -2,7 +2,7 @@ export * from './asset';
 export * from './common';
 export * from './enums';
 export * from './seed';
-export * from './price';
+export * from './market';
 export * from './vault';
 export * from './keypath';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/dist/types/utils/{price.d.ts → market.d.ts}

@@ -1,4 +1,4 @@
-import { Price } from '../types/wallet.types';
+import { MarketData } from '../types/wallet.types';
 export declare const CURRENCIES: readonly [{
     readonly code: "usd";
     readonly symbol: "$";
@@ -11,14 +11,6 @@ export declare const CURRENCIES: readonly [{
     readonly code: "gbp";
     readonly symbol: "£";
     readonly name: "British Pound";
-}, {
-    readonly code: "cny";
-    readonly symbol: "¥";
-    readonly name: "Chinese Yuan";
-}, {
-    readonly code: "jpy";
-    readonly symbol: "¥";
-    readonly name: "Japanese Yen";
 }, {
     readonly code: "aud";
     readonly symbol: "A$";
@@ -31,12 +23,26 @@ export declare const CURRENCIES: readonly [{
     readonly code: "chf";
     readonly symbol: "Fr";
     readonly name: "Swiss Franc";
+}, {
+    readonly code: "inr";
+    readonly symbol: "₹";
+    readonly name: "Indian Rupee";
+}, {
+    readonly code: "cny";
+    readonly symbol: "¥";
+    readonly name: "Chinese Yuan";
+}, {
+    readonly code: "jpy";
+    readonly symbol: "¥";
+    readonly name: "Japanese Yen";
 }];
 export type CurrencyCode = typeof CURRENCIES[number]['code'];
 export type CurrencySymbol = typeof CURRENCIES[number]['symbol'];
 export declare const currencySymbols: Record<CurrencyCode, CurrencySymbol>;
-export declare const currencyCodes: ("usd" | "eur" | "gbp" | "cny" | "jpy" | "aud" | "cad" | "chf")[];
-export declare function getNexaPrices(): Promise<Record<string, number>>;
+export declare const currencyCodes: ("usd" | "eur" | "gbp" | "aud" | "cad" | "chf" | "inr" | "cny" | "jpy")[];
+export declare const SUPPORTED_TOKENS: Record<string, string>;
+export declare function getMarketData(currency: CurrencyCode): Promise<Record<string, MarketData>>;
 export declare function getCurrencySymbol(currency: CurrencyCode): string;
-export declare function initializePrices(): Record<string, Price>;
-//# sourceMappingURL=price.d.ts.map
+export declare function calculateFiatValue(amount: string | number, price: number, currency?: CurrencyCode): string;
+export declare function formatMoney(value: string | number, currency: CurrencyCode, locale?: string): string;
+//# sourceMappingURL=market.d.ts.map

package/dist/types/utils/market.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"market.d.ts","sourceRoot":"","sources":["../../../src/utils/market.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAqBxD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUb,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEjE,eAAO,MAAM,eAAe,EAEvB,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;AAE1C,eAAO,MAAM,aAAa,2EAA8B,CAAC;AAEzD,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAEnD,CAAC;AAEF,wBAAsB,aAAa,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CA4B/F;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,CAEhE;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM,CAI1G;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAU,GAAG,MAAM,CAOpG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otoplo/wallet-common",
-  "version": "0.1.15",
+  "version": "0.2.0",
   "description": "Shared common library for internal use in Otoplo wallet",
   "license": "MIT",
   "author": "vgrunner",
@@ -31,14 +31,13 @@
     "url": "git+https://gitlab.com/nexa/otoplo/otoplo-wallet-common.git"
   },
   "dependencies": {
-    "@scure/bip39": "^2.0.1",
-    "jszip": "^3.10.1"
+    "@scure/bip39": "^2.0.1"
   },
   "devDependencies": {
     "del-cli": "^7.0.0",
     "eslint": "^9.39.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.0",
+    "typescript-eslint": "^8.54.0",
     "vite": "^7.3.1",
     "vite-plugin-dts": "^4.5.4"
   },
@@ -46,7 +45,7 @@
     "@otoplo/electrum-client": "^0.2.1",
     "@reduxjs/toolkit": "^2.11.2",
     "js-big-decimal": "^2.2.0",
-    "libnexa-ts": "^3.0.0",
+    "libnexa-ts": "^3.0.1",
     "react": ">=19.1.0",
     "react-redux": "^9.2.0",
     "wallet-comms-sdk": "^0.9.1"

package/src/persistence/datastore/db.ts

@@ -1,4 +1,5 @@
 import type { AccountEntity, AssetEntity, AssetTransactionEntity, NftEntity, SessionEntity, TokenEntity, TransactionEntity, AddressEntity, VaultEntity } from "../../types/db.types";
+import type { AssetType } from "../../types/wallet.types";
 
 export interface DBStore {
   clearData(): Promise<void>;
@@ -11,22 +12,23 @@ export interface DBStore {
   countTransactions(account: number, tokenId?: string): Promise<number>;
   clearTransactions(account: number): Promise<void>;
   
+  countTokens(account: number): Promise<number>;
   upsertToken(token: TokenEntity): Promise<void>;
-  getTokens(account: number): Promise<AssetEntity[]>;
+  getTokens(account: number, pageNum: number, pageSize: number): Promise<TokenEntity[]>;
   getToken(id: string): Promise<TokenEntity | undefined>;
   deleteToken(id: string): Promise<void>;
   
   countNfts(account: number): Promise<number>;
   upsertNft(nft: NftEntity): Promise<void>;
-  getNfts(account: number, pageNum: number, pageSize: number): Promise<AssetEntity[]>;
+  getNfts(account: number, pageNum: number, pageSize: number): Promise<NftEntity[]>;
   getNft(id: string): Promise<NftEntity | undefined>;
   deleteNft(id: string): Promise<void>;
   isNftExist(id: string): Promise<boolean>;
 
   upsertAsset(asset: AssetEntity): Promise<void>;
+  getAssets(account: number, type: AssetType): Promise<AssetEntity[]>;
   deleteAsset(account: number, id: string): Promise<void>;
   countAssetsById(id: string): Promise<number>;
-  isAssetExistForAccount(account: number, id: string): Promise<boolean>
 
   upsertAccount(account: AccountEntity): Promise<void>;
   getAccounts(): Promise<AccountEntity[]>;

package/src/persistence/wallet-db.ts

@@ -1,14 +1,13 @@
 import type { DBStore } from "./datastore/db";
-import { AccountType, AssetType } from "../utils/enums";
+import { AccountType } from "../utils/enums";
 import type { AccountDTO, AccountEntity, AddressDTO, AddressEntity, AssetEntity, AssetTransactionEntity, NftEntity, SessionEntity, TokenEntity, TransactionEntity, VaultDTO, VaultEntity } from "../types/db.types";
+import type { AssetType } from "../types/wallet.types";
 import { currentTimestamp } from "../utils/common";
 
 export type DBEvent =
   | { type: 'tx_refresh'; }
   | { type: 'nft_refresh'; }
-  | { type: 'token_added'; accountId: number; token: AssetEntity; }
-  | { type: 'token_removed'; accountId: number; tokenId: string; }
-  | { type: 'nft_deleted'; id: string; }
+  | { type: 'token_refresh'; }
 
 export type DBUpdateCallback = (event: DBEvent) => void;
 
@@ -50,11 +49,11 @@ export class WalletDB {
     return this.store.upsertAssetTransaction(assetTx);
   }
 
-  public async getLocalTransactions(account: number, tokenId?: string): Promise<TransactionEntity[] | undefined> {
+  public async getLocalTransactions(account: number, tokenId?: string): Promise<TransactionEntity[]> {
     return this.store.getTransactions(account, tokenId);
   }
 
-  public async getPageLocalTransactions(account: number, pageNum: number, pageSize: number, tokenId?: string): Promise<TransactionEntity[] | undefined> {
+  public async getPageLocalTransactions(account: number, pageNum: number, pageSize: number, tokenId?: string): Promise<TransactionEntity[]> {
     return this.store.getPageTransactions(account, pageNum, pageSize, tokenId);
   }
 
@@ -71,16 +70,16 @@ export class WalletDB {
     const asset: AssetEntity = {
       accountId: account,
       tokenIdHex: token.tokenIdHex,
-      type: AssetType.TOKEN,
+      type: "token",
       addedTime: currentTimestamp()
     }
-    await this.store.upsertAsset(asset);
     await this.store.upsertToken(token);
-    this.notify({ type: 'token_added', accountId: account, token: asset });
+    await this.saveAsset(asset);
+    this.notify({ type: 'token_refresh' });
   }
 
-  public async getLocalTokens(account: number): Promise<AssetEntity[] | undefined> {
-    return this.store.getTokens(account);
+  public async getLocalTokens(account: number, pageNum: number, pageSize: number): Promise<TokenEntity[]> {
+    return this.store.getTokens(account, pageNum, pageSize);
   }
 
   public async getToken(id: string): Promise<TokenEntity | undefined> {
@@ -93,15 +92,22 @@ export class WalletDB {
     if (count == 0) {
       await this.store.deleteToken(tokenId);
     }
-    this.notify({ type: 'token_removed', accountId: account, tokenId: tokenId });
+    this.notify({ type: 'token_refresh' });
   }
 
-  public async saveNft(asset: AssetEntity, nft: NftEntity): Promise<void> {
+  public async saveNft(account: number, nft: NftEntity, time: number): Promise<void> {
+    const asset: AssetEntity = {
+      accountId: account,
+      tokenIdHex: nft.tokenIdHex,
+      type: "nft",
+      addedTime: time
+    }
     await this.store.upsertNft(nft);
-    await this.saveAsset(asset, true);
+    await this.saveAsset(asset);
+    this.notify({ type: 'nft_refresh' });
   }
 
-  public async getLocalNfts(account: number, pageNum: number, pageSize: number): Promise<AssetEntity[] | undefined> {
+  public async getLocalNfts(account: number, pageNum: number, pageSize: number): Promise<NftEntity[]> {
     return this.store.getNfts(account, pageNum, pageSize);
   }
 
@@ -109,16 +115,13 @@ export class WalletDB {
     return this.store.getNft(id);
   }
 
-  public async deleteNft(account: number, tokenId: string, notify = false): Promise<void> {
+  public async deleteNft(account: number, tokenId: string): Promise<void> {
     await this.removeAsset(account, tokenId);
     const count = await this.store.countAssetsById(tokenId);
     if (count == 0) {
       await this.store.deleteNft(tokenId);
-      this.notify({ type: 'nft_deleted', id: tokenId });
-    }
-    if (notify) {
-      this.notify({ type: 'nft_refresh' });
     }
+    this.notify({ type: 'nft_refresh' });
   }
 
   public async countLocalNfts(account: number): Promise<number> {
@@ -129,21 +132,18 @@ export class WalletDB {
     return this.store.isNftExist(id);
   }
 
-  public async saveAsset(asset: AssetEntity, notifyNft = false): Promise<void> {
+  public async getAssets(account: number, type: AssetType): Promise<AssetEntity[]> {
+    return this.store.getAssets(account, type);
+  }
+
+  public async saveAsset(asset: AssetEntity): Promise<void> {
     await this.store.upsertAsset(asset);
-    if (notifyNft) {
-      this.notify({ type: 'nft_refresh' });
-    }
   }
 
   public async removeAsset(account: number, id: string): Promise<void> {
     return this.store.deleteAsset(account, id);
   }
 
-  public async isAssetExistForAccount(account: number, id: string): Promise<boolean> {
-    return this.store.isAssetExistForAccount(account, id);
-  }
-
   public async saveAccount(account: AccountDTO): Promise<void> {
     const accountEntity: AccountEntity = {
       id: account.id,

package/src/services/asset.ts

@@ -1,200 +1,102 @@
-import { Address, AddressType, BufferUtils, GroupIdType, GroupToken, Networks } from "libnexa-ts";
-import type { AssetEntity, NftEntity, TokenEntity } from "../types/db.types";
-import { fetchAssetBlob, fetchAssetDoc, getNiftyToken, isNiftySubgroup, transformTokenIconUrl } from "../utils/asset";
-import { currentTimestamp, getAddressBuffer, tokenHexToAddr, tokenIdToHex } from "../utils/common";
-import { AssetType } from "../utils/enums";
+import type { NftEntity, TokenEntity } from "../types/db.types";
+import { getAssetMetadata } from "../utils/asset";
+import { currentTimestamp, tokenIdToHex } from "../utils/common";
 import type { WalletDB } from "../persistence/wallet-db";
-import type { RostrumService } from "./rostrum";
 import type { WalletCache } from "./cache";
-import JSZip from "jszip";
 import type { AssetInfo, Balance } from "../types/wallet.types";
 
 export class AssetService {
 
   private readonly walletDb: WalletDB;
-  private readonly rostrumService: RostrumService;
   private readonly walletCache: WalletCache;
 
-  constructor(walletDb: WalletDB, rostrumService: RostrumService, walletCache: WalletCache) {
+  constructor(walletDb: WalletDB, walletCache: WalletCache) {
     this.walletDb = walletDb;
-    this.rostrumService = rostrumService;
     this.walletCache = walletCache;
   }
 
-  public async getTokenInfo(token: string, checkCache = true): Promise<TokenEntity | undefined> {
+  public async getAssetInfo(assetId: string): Promise<AssetInfo | undefined> {
     try {
-      if (checkCache) {
-        const cachedToken = await this.walletCache.getTokenById(token);
-        if (cachedToken) {
-          return cachedToken;
+      if (this.walletCache.hasToken(assetId)) {
+        const token = await this.walletCache.getToken(assetId);
+        return {
+          type: "token",
+          parent: token!.parent,
+          token: token!.token,
+          tokenIdHex: token!.tokenIdHex,
+          data: {
+            name: token!.name,
+            ticker: token!.ticker,
+            decimals: token!.decimals,
+            iconUrl: token!.iconUrl
+          }
         }
       }
 
-      const genesis = await this.rostrumService.getTokenGenesis(token);
-      const groupId = BufferUtils.hexToBuffer(genesis.token_id_hex);
-      let parent = "";
-      let iconUrl = "";
-      
-      if (genesis.op_return_id == GroupIdType.NRC2 || genesis.op_return_id == GroupIdType.NRC3 || isNiftySubgroup(token)) {
-        return undefined;
-      }
-      
-      if (GroupToken.isSubgroup(groupId)) {
-        parent = new Address(GroupToken.getParentGroupId(groupId), Networks.defaultNetwork, AddressType.GroupIdAddress).toString();
-      }
-      
-      if (genesis.document_url) {
-        try {
-          if (genesis.op_return_id == GroupIdType.NRC1) {
-            const token_zip = await fetchAssetBlob(genesis.document_url);
-            const zip = await JSZip.loadAsync(token_zip);
-            const info = zip.file('info.json');
-            if (info) {
-              const infoData = await info.async('string');
-              const infoJson = JSON.parse(infoData);
-              iconUrl = transformTokenIconUrl(infoJson[0]?.icon, genesis.document_url);
-            }
-          } else {
-            const infoJson = await fetchAssetDoc(genesis.document_url);
-            iconUrl = transformTokenIconUrl(infoJson[0]?.icon, genesis.document_url);
+      if (this.walletCache.hasNft(assetId)) {
+        const nft = await this.walletCache.getNft(assetId);
+        return {
+          type: "nft",
+          parent: nft!.parent,
+          token: nft!.token,
+          tokenIdHex: nft!.tokenIdHex,
+          data: {
+            name: nft!.name,
+            series: nft!.series,
+            collection: nft!.collection,
+            author: nft!.author,
+            public: nft!.public,
+            front: nft!.front,
+            back: nft!.back
           }
-        } catch (e) {
-          console.error("Failed to load metadata", e)
         }
       }
-      
-      const tokenEntity: TokenEntity = {
-        token: genesis.group,
-        tokenIdHex: genesis.token_id_hex,
-        decimals: genesis.decimal_places ?? 0,
-        parentGroup: parent,
-        name: genesis.name ?? "",
-        ticker: genesis.ticker ?? "",
-        iconUrl: iconUrl
-      };
-      
-      return tokenEntity;
-    } catch (e) {
-      console.error(e)
-      return undefined;
-    }
-  }
-
-  public async isNftToken(token: string): Promise<boolean> {
-    try {
-      if (isNiftySubgroup(token)) {
-        return true;
-      }
 
-      const cachedToken = await this.walletCache.getNftById(token);
-      if (cachedToken) {
-        return true;
-      }
-
-      const genesis = await this.rostrumService.getTokenGenesis(token);
-      if (genesis.op_return_id == GroupIdType.NRC3) {
-        return true;
-      }
+      return await getAssetMetadata(assetId);
     } catch (e) {
-      console.error(e)
-    }
-
-    return false;
-  }
-
-  public async getAssetInfo(token: string): Promise<AssetInfo | undefined> {
-    let asset: AssetInfo | undefined = await this.getTokenInfo(token);
-    if (!asset) {
-      const isNft = await this.isNftToken(token);
-      if (isNft) {
-        asset = {
-          token: tokenHexToAddr(token),
-          tokenIdHex: tokenIdToHex(token),
-          decimals: 0,
-        };
-      }
+      console.error(e);
+      return undefined;
     }
-    return asset;
   }
 
   public async handleNftReceive(accountId: number, tokenIdHex: string, time: number): Promise<void> {
-    const exist = await this.walletDb.isNftExist(tokenIdHex);
-    if (exist) {
-      const asset: AssetEntity = {
-        accountId: accountId,
-        tokenIdHex: tokenIdHex,
-        type: AssetType.NFT,
-        addedTime: time
-      }
-      await this.walletDb.saveAsset(asset, true);
-      return;
-    }
-
-    const genesis = await this.rostrumService.getTokenGenesis(tokenIdHex);
-    if (genesis.op_return_id == GroupIdType.NRC3) {
-      const groupId = getAddressBuffer(tokenIdHex);
-      if (GroupToken.isSubgroup(groupId)) {
-        const parentGroupId = new Address(groupId.subarray(0, 32), Networks.defaultNetwork, AddressType.GroupIdAddress).toString();
-        const parentGenesis = await this.rostrumService.getTokenGenesis(parentGroupId);
-        if (parentGenesis?.op_return_id == GroupIdType.NRC2) {
-          // parent is an NRC-2 collection, this is an NRC-3 NFT. The name of the collection and NRC-3 NFT belongs
-          // to is the name of the NRC-2 collection.
-          await this.saveNft(accountId, tokenIdHex, genesis.document_url ?? '', parentGroupId, time, parentGenesis?.name ?? "");
-        }
-      }
-    } else if (isNiftySubgroup(tokenIdHex)) {
-      // NiftyArt does not have collections, pass "" for the collection
-      await this.saveNft(accountId, tokenIdHex, 'nifty', getNiftyToken().token, time, "");
-    }
-  }
-
-  private async saveNft(account: number, hexId: string, source: string, parent: string, time: number, collection: string): Promise<void> {
-    if (!source) {
-      return;
-    }
-
-    try {
-      const asset: AssetEntity = {
-        accountId: account,
-        tokenIdHex: hexId,
-        type: AssetType.NFT,
-        addedTime: time
-      }
+    const nft = await this.getAssetInfo(tokenIdHex);
+    if (nft && nft.type == 'nft') {
       const nftEntity: NftEntity = {
-        parentGroup: parent,
-        token: tokenHexToAddr(hexId),
-        tokenIdHex: hexId,
-        source: source,
-        collection: collection
+        token: nft.token,
+        tokenIdHex: nft.tokenIdHex,
+        parent: nft.parent,
+        ...nft.data
       }
-
-      await this.walletDb.saveNft(asset, nftEntity);
-    } catch (e) {
-      console.error('failed to save NFT', e);
+      await this.walletDb.saveNft(accountId, nftEntity, time);
     }
   }
 
-  public async fetchAndSaveTokens(accountId: number, tokenBalances: Record<string, Balance>): Promise<void> {
+  public async syncTokens(accountId: number, tokenBalances: Record<string, Balance>): Promise<void> {
     for (const tokenId in tokenBalances) {
-      const token = await this.getTokenInfo(tokenId);
-      if (token) {
-        await this.walletDb.saveToken(accountId, token);
+      const balance = tokenBalances[tokenId];
+      if (balance && BigInt(balance.confirmed) + BigInt(balance.unconfirmed) > 0n) {
+        const token = await this.getAssetInfo(tokenId);
+        if (token && token.type == 'token') {
+          const tokenEntity: TokenEntity = {
+            token: token.token,
+            tokenIdHex: token.tokenIdHex,
+            parent: token.parent,
+            ...token.data
+          };
+          await this.walletDb.saveToken(accountId, tokenEntity);
+        }
       }
     }
   }
 
   public async syncNfts(accountId: number, tokensBalance: Record<string, Balance>): Promise<void> {
     const currentAssets = Object.keys(tokensBalance);
-    const internalAssets = await this.walletDb.getLocalNfts(accountId, 1, 1000);
-
-    const handleNftDelete = async (tokenId: string): Promise<void> => {
-      await this.walletDb.deleteNft(accountId, tokenId, true);
-      this.walletCache.removeNft(tokenId);
-    }
+    const internalAssets = await this.walletDb.getAssets(accountId, "nft");
 
     const staleAssets = internalAssets?.filter(a => !currentAssets.includes(a.tokenIdHex)) ?? [];
     for (const asset of staleAssets) {
-      await handleNftDelete(asset.tokenIdHex);
+      await this.deleteNft(accountId, asset.tokenIdHex);
     }
 
     for (const [token, balance] of Object.entries(tokensBalance)) {
@@ -204,17 +106,22 @@ export class AssetService {
       if ((!hasBalance && !isAssetExist) || (hasBalance && isAssetExist)) {
         continue;
       }
-
-      const isNft = await this.isNftToken(tokenId);
-      if (!isNft) {
-        continue;
-      }
       
       if (!hasBalance && isAssetExist) {
-        await handleNftDelete(tokenId);
+        await this.deleteNft(accountId, tokenId);
       } else {
         await this.handleNftReceive(accountId, tokenId, currentTimestamp());
       }
     }
   }
+
+  public async deleteToken(accountId: number, tokenId: string): Promise<void> {
+    await this.walletDb.deleteToken(accountId, tokenId);
+    this.walletCache.removeToken(tokenId);
+  }
+
+  public async deleteNft(accountId: number, tokenId: string): Promise<void> {
+    await this.walletDb.deleteNft(accountId, tokenId);
+    this.walletCache.removeNft(tokenId);
+  }
 }

package/src/services/cache.ts

@@ -18,7 +18,17 @@ export class WalletCache {
     this.nfts.clear();
   }
 
-  public async getTokenById(id: string): Promise<TokenEntity | undefined> {
+  public hasToken(id: string): boolean {
+    id = tokenIdToHex(id);
+    return this.tokens.has(id);
+  }
+
+  public hasNft(id: string): boolean {
+    id = tokenIdToHex(id);
+    return this.nfts.has(id);
+  }
+
+  public async getToken(id: string): Promise<TokenEntity | undefined> {
     id = tokenIdToHex(id);
     if (this.tokens.has(id)) {
       return this.tokens.get(id)!;
@@ -31,7 +41,7 @@ export class WalletCache {
     return token;
   }
 
-  public async getNftById(id: string): Promise<NftEntity | undefined> {
+  public async getNft(id: string): Promise<NftEntity | undefined> {
     id = tokenIdToHex(id);
     if (this.nfts.has(id)) {
       return this.nfts.get(id)!;